mirror of
https://github.com/systemd/systemd
synced 2024-09-06 16:56:43 +00:00
test: use cap_last_cap() for max supported cap number, not capability_list_length()
This test assumes capability_list_length() is an invalid cap number, but that isn't true if the running kernel supports more caps than we were compiled with, which results in the test failing. Instead use cap_last_cap() + 1. If cap_last_cap() is 63, there are no more 'invalid' cap numbers to test with, so the invalid cap number test part is skipped.
This commit is contained in:
parent
9684a01ce4
commit
ebc815cd1c
|
@ -50,6 +50,9 @@ int capability_from_name(const char *name) {
|
||||||
return sc->id;
|
return sc->id;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/* This is the number of capability names we are *compiled* with.
|
||||||
|
* For the max capability number of the currently-running kernel,
|
||||||
|
* use cap_last_cap(). */
|
||||||
int capability_list_length(void) {
|
int capability_list_length(void) {
|
||||||
return (int) ELEMENTSOF(capability_names);
|
return (int) ELEMENTSOF(capability_names);
|
||||||
}
|
}
|
||||||
|
|
|
@ -55,7 +55,7 @@ static void test_cap_list(void) {
|
||||||
|
|
||||||
static void test_capability_set_one(uint64_t c, const char *t) {
|
static void test_capability_set_one(uint64_t c, const char *t) {
|
||||||
_cleanup_free_ char *t1 = NULL;
|
_cleanup_free_ char *t1 = NULL;
|
||||||
uint64_t c1, c_masked = c & ((UINT64_C(1) << capability_list_length()) - 1);
|
uint64_t c1, c_masked = c & all_capabilities();
|
||||||
|
|
||||||
assert_se(capability_set_to_string_alloc(c, &t1) == 0);
|
assert_se(capability_set_to_string_alloc(c, &t1) == 0);
|
||||||
assert_se(streq(t1, t));
|
assert_se(streq(t1, t));
|
||||||
|
@ -70,7 +70,7 @@ static void test_capability_set_one(uint64_t c, const char *t) {
|
||||||
assert_se(c1 == c_masked);
|
assert_se(c1 == c_masked);
|
||||||
}
|
}
|
||||||
|
|
||||||
static void test_capability_set(void) {
|
static void test_capability_set_from_string(void) {
|
||||||
uint64_t c;
|
uint64_t c;
|
||||||
|
|
||||||
assert_se(capability_set_from_string(NULL, &c) == 0);
|
assert_se(capability_set_from_string(NULL, &c) == 0);
|
||||||
|
@ -87,38 +87,42 @@ static void test_capability_set(void) {
|
||||||
|
|
||||||
assert_se(capability_set_from_string("0 1 2 3", &c) == 0);
|
assert_se(capability_set_from_string("0 1 2 3", &c) == 0);
|
||||||
assert_se(c == (UINT64_C(1) << 4) - 1);
|
assert_se(c == (UINT64_C(1) << 4) - 1);
|
||||||
|
}
|
||||||
|
|
||||||
test_capability_set_one(0, "");
|
static void test_capability_set_to_string(uint64_t invalid_cap_set) {
|
||||||
test_capability_set_one(
|
uint64_t c;
|
||||||
UINT64_C(1) << CAP_DAC_OVERRIDE,
|
|
||||||
"cap_dac_override");
|
test_capability_set_one(invalid_cap_set, "");
|
||||||
test_capability_set_one(
|
|
||||||
UINT64_C(1) << CAP_DAC_OVERRIDE |
|
c = (UINT64_C(1) << CAP_DAC_OVERRIDE | invalid_cap_set);
|
||||||
UINT64_C(1) << capability_list_length(),
|
test_capability_set_one(c, "cap_dac_override");
|
||||||
"cap_dac_override");
|
|
||||||
test_capability_set_one(
|
c = (UINT64_C(1) << CAP_CHOWN |
|
||||||
UINT64_C(1) << capability_list_length(), "");
|
UINT64_C(1) << CAP_DAC_OVERRIDE |
|
||||||
test_capability_set_one(
|
UINT64_C(1) << CAP_DAC_READ_SEARCH |
|
||||||
UINT64_C(1) << CAP_CHOWN |
|
UINT64_C(1) << CAP_FOWNER |
|
||||||
UINT64_C(1) << CAP_DAC_OVERRIDE |
|
UINT64_C(1) << CAP_SETGID |
|
||||||
UINT64_C(1) << CAP_DAC_READ_SEARCH |
|
UINT64_C(1) << CAP_SETUID |
|
||||||
UINT64_C(1) << CAP_FOWNER |
|
UINT64_C(1) << CAP_SYS_PTRACE |
|
||||||
UINT64_C(1) << CAP_SETGID |
|
UINT64_C(1) << CAP_SYS_ADMIN |
|
||||||
UINT64_C(1) << CAP_SETUID |
|
UINT64_C(1) << CAP_AUDIT_CONTROL |
|
||||||
UINT64_C(1) << CAP_SYS_PTRACE |
|
UINT64_C(1) << CAP_MAC_OVERRIDE |
|
||||||
UINT64_C(1) << CAP_SYS_ADMIN |
|
UINT64_C(1) << CAP_SYSLOG |
|
||||||
UINT64_C(1) << CAP_AUDIT_CONTROL |
|
invalid_cap_set);
|
||||||
UINT64_C(1) << CAP_MAC_OVERRIDE |
|
test_capability_set_one(c, ("cap_chown cap_dac_override cap_dac_read_search cap_fowner "
|
||||||
UINT64_C(1) << CAP_SYSLOG |
|
"cap_setgid cap_setuid cap_sys_ptrace cap_sys_admin "
|
||||||
UINT64_C(1) << (capability_list_length() + 1),
|
"cap_audit_control cap_mac_override cap_syslog"));
|
||||||
"cap_chown cap_dac_override cap_dac_read_search cap_fowner "
|
|
||||||
"cap_setgid cap_setuid cap_sys_ptrace cap_sys_admin "
|
|
||||||
"cap_audit_control cap_mac_override cap_syslog");
|
|
||||||
}
|
}
|
||||||
|
|
||||||
int main(int argc, char *argv[]) {
|
int main(int argc, char *argv[]) {
|
||||||
test_cap_list();
|
test_cap_list();
|
||||||
test_capability_set();
|
test_capability_set_from_string();
|
||||||
|
test_capability_set_to_string(0);
|
||||||
|
|
||||||
|
/* once the kernel supports 63 caps, there are no 'invalid' numbers
|
||||||
|
* for us to test with */
|
||||||
|
if (cap_last_cap() < 63)
|
||||||
|
test_capability_set_to_string(all_capabilities() + 1);
|
||||||
|
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue