* [PATCH] selftests/bpf: Strerror expects positive number
@ 2025-03-04 11:17 Feng Yang
2025-03-04 21:05 ` Eduard Zingerman
0 siblings, 1 reply; 5+ messages in thread
From: Feng Yang @ 2025-03-04 11:17 UTC (permalink / raw)
To: bpf, ast
Cc: andrii, daniel, martin.lau, kernel-team, yonghong.song, Feng Yang
From: Feng Yang <yangfeng@kylinos.cn>
Before:
failed to restore CAP_SYS_ADMIN: -1, Unknown error -1
...
After:
failed to restore CAP_SYS_ADMIN: -1, Operation not permitted
...
Signed-off-by: Feng Yang <yangfeng@kylinos.cn>
---
tools/testing/selftests/bpf/prog_tests/verifier.c | 4 ++--
tools/testing/selftests/bpf/test_loader.c | 6 +++---
2 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/tools/testing/selftests/bpf/prog_tests/verifier.c b/tools/testing/selftests/bpf/prog_tests/verifier.c
index 8a0e1ff8a2dc..ecc320e04551 100644
--- a/tools/testing/selftests/bpf/prog_tests/verifier.c
+++ b/tools/testing/selftests/bpf/prog_tests/verifier.c
@@ -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)
diff --git a/tools/testing/selftests/bpf/test_loader.c b/tools/testing/selftests/bpf/test_loader.c
index 53b06647cf57..8a403e5aa314 100644
--- a/tools/testing/selftests/bpf/test_loader.c
+++ b/tools/testing/selftests/bpf/test_loader.c
@@ -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;
}
}
--
2.25.1
^ permalink raw reply related [flat|nested] 5+ messages in thread
* Re: [PATCH] selftests/bpf: Strerror expects positive number
2025-03-04 11:17 Feng Yang
@ 2025-03-04 21:05 ` Eduard Zingerman
0 siblings, 0 replies; 5+ messages in thread
From: Eduard Zingerman @ 2025-03-04 21:05 UTC (permalink / raw)
To: Feng Yang, bpf, ast
Cc: andrii, daniel, martin.lau, kernel-team, yonghong.song, Feng Yang
On Tue, 2025-03-04 at 19:17 +0800, Feng Yang wrote:
> From: Feng Yang <yangfeng@kylinos.cn>
>
> Before:
> failed to restore CAP_SYS_ADMIN: -1, Unknown error -1
> ...
>
> After:
> failed to restore CAP_SYS_ADMIN: -1, Operation not permitted
> ...
>
> Signed-off-by: Feng Yang <yangfeng@kylinos.cn>
> ---
I agree that this is a problem, however man page for capget/capset
functions says:
RETURN VALUE
On success, zero is returned. On error, -1 is returned, and errno is
set to indicate the error.
The calls fail with the error EINVAL, and set the version field of hdrp
to the kernel preferred value of _LINUX_CAPABILITY_VERSION_? when an
unsupported version value is specified. In this way, one can probe what
the current preferred capability revision is.
And cap_{enable,disable}_effective() a wrappers for capget/capset.
So, it looks like cap_{enable,disable}_effective need to be modified
to return either -EINVAL, or -errno, depending on the value returned
by capget/capset.
Could you please adjust that and send a v2?
[...]
^ permalink raw reply [flat|nested] 5+ messages in thread
* [PATCH] selftests/bpf: Strerror expects positive number
@ 2025-03-05 2:22 Feng Yang
2025-03-05 21:49 ` Eduard Zingerman
2025-03-07 17:20 ` patchwork-bot+netdevbpf
0 siblings, 2 replies; 5+ messages in thread
From: Feng Yang @ 2025-03-05 2:22 UTC (permalink / raw)
To: eddyz87
Cc: andrii, ast, bpf, daniel, kernel-team, martin.lau, yangfeng59949,
yangfeng, yonghong.song
From: Feng Yang <yangfeng@kylinos.cn>
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
...
Signed-off-by: Feng Yang <yangfeng@kylinos.cn>
---
Changes in v2:
- cap_{enable,disable}_effective return -errno. Thanks, Eduard Zingerman!
- Link to v1: https://lore.kernel.org/all/20250304111722.7694-1-yangfeng59949@163.com
---
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(-)
diff --git a/tools/testing/selftests/bpf/cap_helpers.c b/tools/testing/selftests/bpf/cap_helpers.c
index d5ac507401d7..98f840c3a38f 100644
--- a/tools/testing/selftests/bpf/cap_helpers.c
+++ b/tools/testing/selftests/bpf/cap_helpers.c
@@ -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;
}
diff --git a/tools/testing/selftests/bpf/cap_helpers.h b/tools/testing/selftests/bpf/cap_helpers.h
index 6d163530cb0f..8dcb28557f76 100644
--- a/tools/testing/selftests/bpf/cap_helpers.h
+++ b/tools/testing/selftests/bpf/cap_helpers.h
@@ -4,6 +4,7 @@
#include <linux/types.h>
#include <linux/capability.h>
+#include <errno.h>
#ifndef CAP_PERFMON
#define CAP_PERFMON 38
diff --git a/tools/testing/selftests/bpf/prog_tests/verifier.c b/tools/testing/selftests/bpf/prog_tests/verifier.c
index 8a0e1ff8a2dc..ecc320e04551 100644
--- a/tools/testing/selftests/bpf/prog_tests/verifier.c
+++ b/tools/testing/selftests/bpf/prog_tests/verifier.c
@@ -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)
diff --git a/tools/testing/selftests/bpf/test_loader.c b/tools/testing/selftests/bpf/test_loader.c
index 53b06647cf57..8a403e5aa314 100644
--- a/tools/testing/selftests/bpf/test_loader.c
+++ b/tools/testing/selftests/bpf/test_loader.c
@@ -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;
}
}
--
2.25.1
^ permalink raw reply related [flat|nested] 5+ messages in thread
* Re: [PATCH] selftests/bpf: Strerror expects positive number
2025-03-05 2:22 [PATCH] selftests/bpf: Strerror expects positive number Feng Yang
@ 2025-03-05 21:49 ` Eduard Zingerman
2025-03-07 17:20 ` patchwork-bot+netdevbpf
1 sibling, 0 replies; 5+ messages in thread
From: Eduard Zingerman @ 2025-03-05 21:49 UTC (permalink / raw)
To: Feng Yang
Cc: andrii, ast, bpf, daniel, kernel-team, martin.lau, yangfeng,
yonghong.song
On Wed, 2025-03-05 at 10:22 +0800, Feng Yang wrote:
> From: Feng Yang <yangfeng@kylinos.cn>
>
> 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
> ...
>
> Signed-off-by: Feng Yang <yangfeng@kylinos.cn>
> ---
> Changes in v2:
> - cap_{enable,disable}_effective return -errno. Thanks, Eduard Zingerman!
> - Link to v1: https://lore.kernel.org/all/20250304111722.7694-1-yangfeng59949@163.com
> ---
Thank you for fixing this.
Nit: for a v2 of the patch please use '[PATCH v2]' tag.
Acked-by: Eduard Zingerman <eddyz87@gmail.com>
[...]
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH] selftests/bpf: Strerror expects positive number
2025-03-05 2:22 [PATCH] selftests/bpf: Strerror expects positive number Feng Yang
2025-03-05 21:49 ` Eduard Zingerman
@ 2025-03-07 17:20 ` patchwork-bot+netdevbpf
1 sibling, 0 replies; 5+ messages in thread
From: patchwork-bot+netdevbpf @ 2025-03-07 17:20 UTC (permalink / raw)
To: Feng Yang
Cc: eddyz87, andrii, ast, bpf, daniel, kernel-team, martin.lau,
yangfeng, yonghong.song
Hello:
This patch was applied to bpf/bpf-next.git (master)
by Alexei Starovoitov <ast@kernel.org>:
On Wed, 5 Mar 2025 10:22:34 +0800 you wrote:
> From: Feng Yang <yangfeng@kylinos.cn>
>
> 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
> ...
>
> [...]
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!
--
Deet-doot-dot, I am a bot.
https://korg.docs.kernel.org/patchwork/pwbot.html
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2025-03-07 17:20 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2025-03-05 2:22 [PATCH] selftests/bpf: Strerror expects positive number Feng Yang
2025-03-05 21:49 ` Eduard Zingerman
2025-03-07 17:20 ` patchwork-bot+netdevbpf
-- strict thread matches above, loose matches on Subject: below --
2025-03-04 11:17 Feng Yang
2025-03-04 21:05 ` Eduard Zingerman
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox