summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoanne Koong <joannelkoong@gmail.com>2023-03-01 21:30:14 -0800
committerAndrii Nakryiko <andrii@kernel.org>2023-03-01 21:36:29 -0800
commitc45eac537bd8b4977d335c123212140bc5257670 (patch)
treed56603cad89656191553a849b51036c7801720ea
parentb1d462bc30e70d89e7b729391d7585443f2910c8 (diff)
bpf: Fix bpf_dynptr_slice{_rdwr} to return NULL instead of 0
Change bpf_dynptr_slice and bpf_dynptr_slice_rdwr to return NULL instead of 0, in accordance with the codebase guidelines. Fixes: 66e3a13e7c2c ("bpf: Add bpf_dynptr_slice and bpf_dynptr_slice_rdwr") Reported-by: kernel test robot <lkp@intel.com> Signed-off-by: Joanne Koong <joannelkoong@gmail.com> Signed-off-by: Andrii Nakryiko <andrii@kernel.org> Link: https://lore.kernel.org/bpf/20230302053014.1726219-1-joannelkoong@gmail.com
-rw-r--r--kernel/bpf/helpers.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/kernel/bpf/helpers.c b/kernel/bpf/helpers.c
index 58431a92bb65..de9ef8476e29 100644
--- a/kernel/bpf/helpers.c
+++ b/kernel/bpf/helpers.c
@@ -2227,11 +2227,11 @@ __bpf_kfunc void *bpf_dynptr_slice(const struct bpf_dynptr_kern *ptr, u32 offset
int err;
if (!ptr->data)
- return 0;
+ return NULL;
err = bpf_dynptr_check_off_len(ptr, offset, len);
if (err)
- return 0;
+ return NULL;
type = bpf_dynptr_get_type(ptr);
@@ -2252,7 +2252,7 @@ __bpf_kfunc void *bpf_dynptr_slice(const struct bpf_dynptr_kern *ptr, u32 offset
}
default:
WARN_ONCE(true, "unknown dynptr type %d\n", type);
- return 0;
+ return NULL;
}
}
@@ -2300,7 +2300,7 @@ __bpf_kfunc void *bpf_dynptr_slice_rdwr(const struct bpf_dynptr_kern *ptr, u32 o
void *buffer, u32 buffer__szk)
{
if (!ptr->data || bpf_dynptr_is_rdonly(ptr))
- return 0;
+ return NULL;
/* bpf_dynptr_slice_rdwr is the same logic as bpf_dynptr_slice.
*