bpf: Check IS_ERR for the bpf_map_get() return value
Martin KaFai Lau
reviewerPATCH 1/1 bpf: Check IS_ERR for the bpf_map_get() return value
From: Martin KaFai Lau <[email protected]>
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).
--- kernel/bpf/bpf_struct_ops.c | 4 ++-- kernel/bpf/syscall.c | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-)
kernel/bpf/bpf_struct_ops.c +2 -2
@@ -871,8 +871,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;
kernel/bpf/syscall.c +2 -2
@@ -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) {
Signature · 1 line
2.34.1
This fix makes sense to me.
Thank you for fixing this.
Quoted 51 lines · Martin KaFai Lau
From: Martin KaFai Lau <[email protected]>
This patch fixes a mistake in checking NULL instead of checking
IS_ERRfor thebpf_map_get()return value.It also fixes the return value in
link_update_map()from-EINVALtoPTR_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]>--- kernel/bpf/bpf_struct_ops.c | 4 ++-- kernel/bpf/syscall.c | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-)kernel/bpf/bpf_struct_ops.c +2
-2@@ -871,8 +871,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;kernel/bpf/syscall.c +2
-2@@ -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) {
Quoted 5 lines · Martin KaFai Lau
From: Martin KaFai Lau <[email protected]>
This patch fixes a mistake in checking NULL instead of checking
IS_ERRfor thebpf_map_get()return value.
Quoted 7 lines
It also fixes the return value in
link_update_map()from-EINVALtoPTR_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]>
Quoted 42 lines
--- kernel/bpf/bpf_struct_ops.c | 4 ++-- kernel/bpf/syscall.c | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-)kernel/bpf/bpf_struct_ops.c +2
-2@@ -871,8 +871,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;kernel/bpf/syscall.c +2
-2@@ -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) {
--
2.34.1
This patch was applied to bpf/bpf-next.git (master) by Alexei Starovoitov <[email protected]>:
Hello:
This patch was applied to bpf/bpf-next.git (master) by Alexei Starovoitov <[email protected]>:
Quoted 9 lines · On Fri, 24 Mar 2023 11:42:41 -0700 you wrote:
From: Martin KaFai Lau <[email protected]>
This patch fixes a mistake in checking NULL instead of checking
IS_ERRfor thebpf_map_get()return value.It also fixes the return value in
link_update_map()from-EINVALtoPTR_ERR(*_map).[...]
Here is the summary with links:
- [bpf-next] bpf: Check IS_ERR for the bpf_map_get() return value
https://git.kernel.org/bpf/bpf-next/c/55fbae05476d
You are awesome, thank you!
Signature · 2 lines
Deet-doot-dot, I am a bot. https://korg.docs.kernel.org/patchwork/pwbot.html