bpf/helpers: bpf_strnstr: Exact match length
Subsystems (3)
A message that is not in the archive (sent off-list or not yet received): [email protected]
PATCH v2 1/2 bpf/helpers: bpf_strnstr: Exact match length
From: Rong Tao <[email protected]>
strnstr should not treat the ending '\0' of s2 as a matching character, otherwise the parameter 'len' will be meaningless, for example:
1. bpf_strnstr("openat", "open", 4) = -ENOENT
2. bpf_strnstr("openat", "open", 5) = 0
This patch makes (1) return 0, indicating a successful match.
Signed-off-by Rong Tao <[email protected]>
--- kernel/bpf/helpers.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
kernel/bpf/helpers.c +3 -1
@@ -3672,10 +3672,12 @@ __bpf_kfunc int bpf_strnstr(const char *s1__ign, const char *s2__ign, size_t lenguard (pagefault)();for (i =0 ; i <XATTR_SIZE_MAX ; i++) { -for (j =0 ; i + j < len && j <XATTR_SIZE_MAX ; j++) { +for (j =0 ; i + j <= len && j <XATTR_SIZE_MAX ; j++) {__get_kernel_nofault (&c2, s2__ign + j, char, err_out);if (c2 =='\0' )return i; +if (i + j == len) +break ;__get_kernel_nofault (&c1, s1__ign + j, char, err_out);if (c1 =='\0' )return -ENOENT ;
Signature · 1 line
2.51.0
PATCH v2 2/2 selftests/bpf: Add tests for bpf_strnstr
In reply to a message not in the archiveFrom: Rong Tao <[email protected]>
Add two tests for bpf_strnstr():
bpf_strnstr("", "", 0) = 0
bpf_strnstr("hello world", "hello", 5) = 0Signed-off-by Rong Tao <[email protected]>
--- tools/testing/selftests/bpf/progs/string_kfuncs_success.c | 2 ++ 1 file changed, 2 insertions(+)
tools/testing/selftests/bpf/progs/string_kfuncs_success.c +2 -0
@@ -30,6 +30,8 @@ __test(2) int test_strcspn(void *ctx) { return bpf_strcspn(str, "lo"); } __test(6) int test_strstr_found(void *ctx) { return bpf_strstr(str, "world"); } __test(-ENOENT) int test_strstr_notfound(void *ctx) { return bpf_strstr(str, "hi"); } __test(0) int test_strstr_empty(void *ctx) { return bpf_strstr(str, ""); } +__test(0) int test_strnstr_found(void *ctx) { return bpf_strnstr("", "", 0); } +__test(0) int test_strnstr_found(void *ctx) { return bpf_strnstr(str, "hello", 5); } __test(0) int test_strnstr_found(void *ctx) { return bpf_strnstr(str, "hello", 6); } __test(-ENOENT) int test_strnstr_notfound(void *ctx) { return bpf_strnstr(str, "hi", 10); } __test(0) int test_strnstr_empty(void *ctx) { return bpf_strnstr(str, "", 1); }
Signature · 1 line
2.51.0