qiurui
/
Centos-kernel-stream-9
mirror of https://gitlab.com/redhat/centos-stream/src/kernel/centos-stream-9.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

bpf: Check IS_ERR for the bpf_map_get() return value 

Bugzilla: https://bugzilla.redhat.com/2221599

commit 55fbae05476df65e5eee8be54f61d0257af0240b
Author: Martin KaFai Lau <martin.lau@kernel.org>
Date:   Fri Mar 24 11:42:41 2023 -0700

    bpf: Check IS_ERR for the bpf_map_get() return value
    
    This patch fixes a mistake in checking NULL instead of
    checking IS_ERR for the bpf_map_get() return value.
    
    It also fixes the return value in link_update_map() from -EINVAL
    to PTR_ERR(*_map).
    
    Reported-by: syzbot+71ccc0fe37abb458406b@syzkaller.appspotmail.com
    Fixes: 68b04864ca42 ("bpf: Create links for BPF struct_ops maps.")
    Fixes: aef56f2e918b ("bpf: Update the struct_ops of a bpf_link.")
    Signed-off-by: Martin KaFai Lau <martin.lau@kernel.org>
    Acked-by: Kui-Feng Lee <kuifeng@meta.com>
    Acked-by: Stanislav Fomichev <sdf@google.com>
    Link: https://lore.kernel.org/r/20230324184241.1387437-1-martin.lau@linux.dev
    Signed-off-by: Alexei Starovoitov <ast@kernel.org>

Signed-off-by: Artem Savkov <asavkov@redhat.com>
This commit is contained in:
Artem Savkov 2023-07-10 15:58:50 +02:00
parent b137d3b540
commit 54175d4877
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
kernel/bpf/bpf_struct_ops.c
View File

@ -873,8 +873,8 @@ int bpf_struct_ops_link_create(union bpf_attr *attr)
int err;
map = bpf_map_get(attr->link_create.map_fd);
if (!map)
return -EINVAL;
if (IS_ERR(map))
return PTR_ERR(map);
st_map = (struct bpf_struct_ops_map *)map;

4
kernel/bpf/syscall.c
View File

@ -4707,12 +4707,12 @@ static int link_update_map(struct bpf_link *link, union bpf_attr *attr)
new_map = bpf_map_get(attr->link_update.new_map_fd);
if (IS_ERR(new_map))
return -EINVAL;
return PTR_ERR(new_map);
if (attr->link_update.flags & BPF_F_REPLACE) {
old_map = bpf_map_get(attr->link_update.old_map_fd);
if (IS_ERR(old_map)) {
ret = -EINVAL;
ret = PTR_ERR(old_map);
goto out_put;
}
} else if (attr->link_update.old_map_fd) {