Gh0st
/
linux
mirror of https://github.com/torvalds/linux.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

selftests/landlock: Clean up error logs related to capabilities 

It doesn't help to call TH_LOG() for every cap_*() error. Let's only
log errors returned by the kernel, not by libcap specificities.

Link: https://lore.kernel.org/r/20240125153230.3817165-3-mic@digikod.net
Signed-off-by: Mickaël Salaün <mic@digikod.net>
This commit is contained in:
Mickaël Salaün 2024-01-25 16:32:30 +01:00
parent d9818b3e90
commit a3f16298b3
No known key found for this signature in database
GPG Key ID: E5E3D0E88C82F6D2
1 changed files with 9 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
tools/testing/selftests/landlock/common.h
View File

@ -128,31 +128,19 @@ static void _init_caps(struct __test_metadata *const _metadata, bool drop_all)
EXPECT_EQ(0, cap_set_secbits(noroot)); EXPECT_EQ(0, cap_set_secbits(noroot));
cap_p = cap_get_proc(); cap_p = cap_get_proc();
EXPECT_NE(NULL, cap_p) EXPECT_NE(NULL, cap_p);
{ EXPECT_NE(-1, cap_clear(cap_p));
TH_LOG("Failed to cap_get_proc: %s", strerror(errno));
}
EXPECT_NE(-1, cap_clear(cap_p))
{
TH_LOG("Failed to cap_clear: %s", strerror(errno));
}
if (!drop_all) { if (!drop_all) {
EXPECT_NE(-1, cap_set_flag(cap_p, CAP_PERMITTED, EXPECT_NE(-1, cap_set_flag(cap_p, CAP_PERMITTED,
ARRAY_SIZE(caps), caps, CAP_SET)) ARRAY_SIZE(caps), caps, CAP_SET));
{
TH_LOG("Failed to cap_set_flag: %s", strerror(errno));
}
} }
/* Automatically resets ambient capabilities. */ /* Automatically resets ambient capabilities. */
EXPECT_NE(-1, cap_set_proc(cap_p)) EXPECT_NE(-1, cap_set_proc(cap_p))
{ {
TH_LOG("Failed to cap_set_proc: %s", strerror(errno)); TH_LOG("Failed to set capabilities: %s", strerror(errno));
}
EXPECT_NE(-1, cap_free(cap_p))
{
TH_LOG("Failed to cap_free: %s", strerror(errno));
} }
EXPECT_NE(-1, cap_free(cap_p));
/* Quickly checks that ambient capabilities are cleared. */ /* Quickly checks that ambient capabilities are cleared. */
EXPECT_NE(-1, cap_get_ambient(caps[0])); EXPECT_NE(-1, cap_get_ambient(caps[0]));
@ -176,22 +164,13 @@ static void _change_cap(struct __test_metadata *const _metadata,
cap_t cap_p; cap_t cap_p;
cap_p = cap_get_proc(); cap_p = cap_get_proc();
EXPECT_NE(NULL, cap_p) EXPECT_NE(NULL, cap_p);
{ EXPECT_NE(-1, cap_set_flag(cap_p, flag, 1, &cap, value));
TH_LOG("Failed to cap_get_proc: %s", strerror(errno));
}
EXPECT_NE(-1, cap_set_flag(cap_p, flag, 1, &cap, value))
{
TH_LOG("Failed to cap_set_flag: %s", strerror(errno));
}
EXPECT_NE(-1, cap_set_proc(cap_p)) EXPECT_NE(-1, cap_set_proc(cap_p))
{ {
TH_LOG("Failed to cap_set_proc: %s", strerror(errno)); TH_LOG("Failed to set capability %d: %s", cap, strerror(errno));
}
EXPECT_NE(-1, cap_free(cap_p))
{
TH_LOG("Failed to cap_free: %s", strerror(errno));
} }
EXPECT_NE(-1, cap_free(cap_p));
} }
static void __maybe_unused set_cap(struct __test_metadata *const _metadata, static void __maybe_unused set_cap(struct __test_metadata *const _metadata,