selftests/bpf: Strerror expects positive number
Subsystems (3)
PATCH 1/1 selftests/bpf: Strerror expects positive number
From: Feng Yang <[email protected]>
Before:
failed to restore CAP_SYS_ADMIN: -1, Unknown error -1
...
After:
failed to restore CAP_SYS_ADMIN: -3, No such process failed to restore CAP_SYS_ADMIN: -22, Invalid argument
...
---
Changes in v2:
- cap_{enable,disable}_effective return -errno. Thanks, Eduard Zingerman!
- Link to v1: https://lore.kernel.org/all/[email protected]
--- tools/testing/selftests/bpf/cap_helpers.c | 8 ++++---- tools/testing/selftests/bpf/cap_helpers.h | 1 + tools/testing/selftests/bpf/prog_tests/verifier.c | 4 ++-- tools/testing/selftests/bpf/test_loader.c | 6 +++--- 4 files changed, 10 insertions(+), 9 deletions(-)
tools/testing/selftests/bpf/cap_helpers.c +4 -4
@@ -19,7 +19,7 @@ int cap_enable_effective(__u64 caps, __u64 *old_caps) err =capget (&hdr, data);if (err) -return err; +return -errno;if (old_caps) *old_caps = (__u64)(data[1 ].effective) <<32 | data[0 ].effective;
@@ -32,7 +32,7 @@ int cap_enable_effective(__u64 caps, __u64 *old_caps) data[1 ].effective |= cap1; err =capset (&hdr, data);if (err) -return err; +return -errno;return 0 ; }
@@ -49,7 +49,7 @@ int cap_disable_effective(__u64 caps, __u64 *old_caps) err =capget (&hdr, data);if (err) -return err; +return -errno;if (old_caps) *old_caps = (__u64)(data[1 ].effective) <<32 | data[0 ].effective;
@@ -61,7 +61,7 @@ int cap_disable_effective(__u64 caps, __u64 *old_caps) data[1 ].effective &= ~cap1; err =capset (&hdr, data);if (err) -return err; +return -errno;return 0 ; }
tools/testing/selftests/bpf/cap_helpers.h +1 -0
@@ -4,6 +4,7 @@#include <linux/types.h> #include <linux/capability.h> +#include <errno.h> #ifndef CAP_PERFMON #define CAP_PERFMON 38
tools/testing/selftests/bpf/prog_tests/verifier.c +2 -2
@@ -121,7 +121,7 @@ static void run_tests_aux(const char *skel_name,/* test_verifier tests are executed w/o CAP_SYS_ADMIN, do the same here */ err =cap_disable_effective (1ULL <<CAP_SYS_ADMIN , &old_caps);if (err) { -PRINT_FAIL ("failed to drop CAP_SYS_ADMIN: %i, %s\n" , err,strerror (err)); +PRINT_FAIL ("failed to drop CAP_SYS_ADMIN: %i, %s\n" , err,strerror (-err));return ; }
@@ -131,7 +131,7 @@ static void run_tests_aux(const char *skel_name, err =cap_enable_effective (old_caps,NULL );if (err) -PRINT_FAIL ("failed to restore CAP_SYS_ADMIN: %i, %s\n" , err,strerror (err)); +PRINT_FAIL ("failed to restore CAP_SYS_ADMIN: %i, %s\n" , err,strerror (-err)); }#define RUN (skel) run_tests_aux(#skel, skel##__elf_bytes, NULL)
tools/testing/selftests/bpf/test_loader.c +3 -3
@@ -773,7 +773,7 @@ static int drop_capabilities(struct cap_state *caps) err =cap_disable_effective (caps_to_drop, &caps->old_caps);if (err) { -PRINT_FAIL ("failed to drop capabilities: %i, %s\n" , err,strerror (err)); +PRINT_FAIL ("failed to drop capabilities: %i, %s\n" , err,strerror (-err));return err; }
@@ -790,7 +790,7 @@ static int restore_capabilities(struct cap_state *caps) err =cap_enable_effective (caps->old_caps,NULL );if (err) -PRINT_FAIL ("failed to restore capabilities: %i, %s\n" , err,strerror (err)); +PRINT_FAIL ("failed to restore capabilities: %i, %s\n" , err,strerror (-err)); caps->initialized = false;return err; }
@@ -959,7 +959,7 @@ void run_subtest(struct test_loader *tester,if (subspec->caps) { err =cap_enable_effective (subspec->caps,NULL );if (err) { -PRINT_FAIL ("failed to set capabilities: %i, %s\n" , err,strerror (err)); +PRINT_FAIL ("failed to set capabilities: %i, %s\n" , err,strerror (-err)); goto subtest_cleanup; } }
Signature · 1 line
2.25.1
Quoted 11 lines · Feng Yang
From: Feng Yang <[email protected]>
Before:
failed to restoreCAP_SYS_ADMIN: -1, Unknown error -1
...After:
failed to restoreCAP_SYS_ADMIN: -3, No such process failed to restoreCAP_SYS_ADMIN: -22, Invalid argument
...
Quoted 6 lines
Signed-off-by Feng Yang <[email protected]>---
Changes in v2:
- cap_{enable,disable}_effective return -errno. Thanks, Eduard Zingerman!
- Link to v1: https://lore.kernel.org/all/[email protected]
---
Thank you for fixing this.
Nit: for a v2 of the patch please use '[PATCH v2]' tag.
[...]
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 6 lines · On Wed, 5 Mar 2025 10:22:34 +0800 you wrote:
From: Feng Yang <[email protected]>
Before:
failed to restoreCAP_SYS_ADMIN: -1, Unknown error -1
...
Quoted 6 lines
After:
failed to restoreCAP_SYS_ADMIN: -3, No such process failed to restoreCAP_SYS_ADMIN: -22, Invalid argument
...[...]
Here is the summary with links:
- selftests/bpf: Strerror expects positive number
https://git.kernel.org/bpf/bpf-next/c/7e437dcd3975
You are awesome, thank you!
Signature · 2 lines
Deet-doot-dot, I am a bot. https://korg.docs.kernel.org/patchwork/pwbot.html