aboutsummaryrefslogtreecommitdiff
path: root/kernel/bpf/syscall.c
diff options
context:
space:
mode:
authorMartin KaFai Lau <[email protected]>2023-03-24 11:42:41 -0700
committerAlexei Starovoitov <[email protected]>2023-03-24 12:40:47 -0700
commit55fbae05476df65e5eee8be54f61d0257af0240b (patch)
tree32a0ed63009db5289dd0d5082e0b27c8440170a4 /kernel/bpf/syscall.c
parent226bc6ae6405c46a6e9865835c36a1d45fc0b3bf (diff)
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: [email protected] 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 <[email protected]> Acked-by: Kui-Feng Lee <[email protected]> Acked-by: Stanislav Fomichev <[email protected]> Link: https://lore.kernel.org/r/[email protected] Signed-off-by: Alexei Starovoitov <[email protected]>
Diffstat (limited to 'kernel/bpf/syscall.c')
-rw-r--r--kernel/bpf/syscall.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/kernel/bpf/syscall.c b/kernel/bpf/syscall.c
index b4d758fa5981..a09597c95029 100644
--- a/kernel/bpf/syscall.c
+++ b/kernel/bpf/syscall.c
@@ -4689,12 +4689,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) {