| Message ID | 20201229134834.22962-1-zhengyongjun3@huawei.com (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | f734031bb4c7a720c7abfdb76fc5df7df2b89e96 |
| Delegated to: | BPF |
| Headers | show |
| Series | [net-next] net: core: Replace fput with sockfd_put | expand |
| Context | Check | Description |
|---|---|---|
| netdev/cover_letter | success | Link |
| netdev/fixes_present | success | Link |
| netdev/patch_count | success | Link |
| netdev/tree_selection | success | Clearly marked for net-next |
| netdev/subject_prefix | success | Link |
| netdev/cc_maintainers | warning | 6 maintainers not CCed: kpsingh@kernel.org andrii@kernel.org songliubraving@fb.com yhs@fb.com kafai@fb.com ast@kernel.org |
| netdev/source_inline | success | Was 0 now: 0 |
| netdev/verify_signedoff | success | Link |
| netdev/module_param | success | Was 0 now: 0 |
| netdev/build_32bit | success | Errors and warnings before: 1 this patch: 1 |
| netdev/kdoc | success | Errors and warnings before: 0 this patch: 0 |
| netdev/verify_fixes | success | Link |
| netdev/checkpatch | success | total: 0 errors, 0 warnings, 0 checks, 8 lines checked |
| netdev/build_allmodconfig_warn | success | Errors and warnings before: 1 this patch: 1 |
| netdev/header_inline | success | Link |
| netdev/stable | success | Stable not CCed |
Hello: This patch was applied to bpf/bpf-next.git (refs/heads/master): On Tue, 29 Dec 2020 21:48:34 +0800 you wrote: > The function sockfd_lookup uses fget on the value that is stored in > the file field of the returned structure, so fput should ultimately be > applied to this value. This can be done directly, but it seems better > to use the specific macro sockfd_put, which does the same thing. > > The problem was fixed using the following semantic patch. > (http://www.emn.fr/x-info/coccinelle/) > > [...] Here is the summary with links: - [net-next] net: core: Replace fput with sockfd_put https://git.kernel.org/bpf/bpf-next/c/f734031bb4c7 You are awesome, thank you! -- Deet-doot-dot, I am a bot. https://korg.docs.kernel.org/patchwork/pwbot.html
diff --git a/net/core/sock_map.c b/net/core/sock_map.c index ddc899e83313..2e59256a06e9 100644 --- a/net/core/sock_map.c +++ b/net/core/sock_map.c @@ -611,7 +611,7 @@ int sock_map_update_elem_sys(struct bpf_map *map, void *key, void *value, ret = sock_hash_update_common(map, key, sk, flags); sock_map_sk_release(sk); out: - fput(sock->file); + sockfd_put(sock); return ret; }
The function sockfd_lookup uses fget on the value that is stored in the file field of the returned structure, so fput should ultimately be applied to this value. This can be done directly, but it seems better to use the specific macro sockfd_put, which does the same thing. The problem was fixed using the following semantic patch. (http://www.emn.fr/x-info/coccinelle/) // <smpl> @@ expression s; @@ s = sockfd_lookup(...) ... + sockfd_put(s); ?- fput(s->file); // </smpl> Signed-off-by: Zheng Yongjun <zhengyongjun3@huawei.com> --- net/core/sock_map.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)