lkml.org 
[lkml]   [2019]   [Nov]   [22]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH AUTOSEL 4.14 114/127] bpf: decrease usercnt if bpf_map_new_fd() fails in bpf_map_get_fd_by_id()
    Date
    From: Peng Sun <sironhide0null@gmail.com>

    [ Upstream commit 781e62823cb81b972dc8652c1827205cda2ac9ac ]

    In bpf/syscall.c, bpf_map_get_fd_by_id() use bpf_map_inc_not_zero()
    to increase the refcount, both map->refcnt and map->usercnt. Then, if
    bpf_map_new_fd() fails, should handle map->usercnt too.

    Fixes: bd5f5f4ecb78 ("bpf: Add BPF_MAP_GET_FD_BY_ID")
    Signed-off-by: Peng Sun <sironhide0null@gmail.com>
    Acked-by: Martin KaFai Lau <kafai@fb.com>
    Signed-off-by: Daniel Borkmann <daniel@iogearbox.net>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    kernel/bpf/syscall.c | 2 +-
    1 file changed, 1 insertion(+), 1 deletion(-)

    diff --git a/kernel/bpf/syscall.c b/kernel/bpf/syscall.c
    index 59d2e94ecb798..34110450a78f2 100644
    --- a/kernel/bpf/syscall.c
    +++ b/kernel/bpf/syscall.c
    @@ -1354,7 +1354,7 @@ static int bpf_map_get_fd_by_id(const union bpf_attr *attr)

    fd = bpf_map_new_fd(map);
    if (fd < 0)
    - bpf_map_put(map);
    + bpf_map_put_with_uref(map);

    return fd;
    }
    --
    2.20.1
    \
     
     \ /
      Last update: 2019-11-22 06:59    [W:4.727 / U:0.012 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site