diff options
author | Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> | 2020-07-09 23:15:47 +0200 |
---|---|---|
committer | Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> | 2020-07-10 16:55:24 +0200 |
commit | 417770f3033c426ca848b158d0bf057cd8ad1329 (patch) | |
tree | c254d9ef1a92a363cf4f5a3b24a18f500a2ee248 /src/basic/cap-list.c | |
parent | NEWS: add date (diff) | |
download | systemd-417770f3033c426ca848b158d0bf057cd8ad1329.tar.xz systemd-417770f3033c426ca848b158d0bf057cd8ad1329.zip |
basic/cap-list: parse/print numerical capabilities
We would refuse to print capabilities which were didn't have a name
for. The kernel adds new capabilities from time to time, most recently
cap_bpf. 'systmectl show -p CapabilityBoundingSet ...' would fail with
"Failed to parse bus message: Invalid argument" because
capability_set_to_string_alloc() would fail with -EINVAL. So let's
print such capabilities in hexadecimal:
CapabilityBoundingSet=cap_chown cap_dac_override cap_dac_read_search
cap_fowner cap_fsetid cap_kill cap_setgid cap_setuid cap_setpcap
cap_linux_immutable cap_net_bind_service cap_net_broadcast cap_net_admin
cap_net_raw cap_ipc_lock cap_ipc_owner 0x10 0x11 0x12 0x13 0x14 0x15 0x16
0x17 0x18 0x19 0x1a ...
For symmetry, also allow capabilities that we don't know to be specified.
Fixes https://bugzilla.redhat.com/show_bug.cgi?id=1853736.
Diffstat (limited to 'src/basic/cap-list.c')
-rw-r--r-- | src/basic/cap-list.c | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/src/basic/cap-list.c b/src/basic/cap-list.c index 84083b4544..af27d84ba4 100644 --- a/src/basic/cap-list.c +++ b/src/basic/cap-list.c @@ -9,6 +9,7 @@ #include "extract-word.h" #include "macro.h" #include "parse-util.h" +#include "stdio-util.h" #include "util.h" static const struct capability_name* lookup_capability(register const char *str, register GPERF_LEN_TYPE len); @@ -36,7 +37,7 @@ int capability_from_name(const char *name) { /* Try to parse numeric capability */ r = safe_atoi(name, &i); if (r >= 0) { - if (i >= 0 && (size_t) i < ELEMENTSOF(capability_names)) + if (i >= 0 && i < 64) return i; else return -EINVAL; @@ -64,11 +65,14 @@ int capability_set_to_string_alloc(uint64_t set, char **s) { for (i = 0; i <= cap_last_cap(); i++) if (set & (UINT64_C(1) << i)) { const char *p; + char buf[2 + 16 + 1]; size_t add; p = capability_to_name(i); - if (!p) - return -EINVAL; + if (!p) { + xsprintf(buf, "0x%lx", i); + p = buf; + } add = strlen(p); |