shaba/systemd
1
0
Fork 0
mirror of https://github.com/systemd/systemd.git synced 2024-11-07 18:27:04 +03:00
Code

shared/capability: don't be too frugal on space for caps

Browse Source 
We were dropping the most significant bit. Add an assert to make sure it does not happen again.

Fixes a bug introduced in 7d328b5446.
This commit is contained in:
Tom Gundersen 2015-02-04 09:23:24 +01:00
parent 798d3a524e
commit 057255fbbf
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/shared/capability.c
View File

@ -269,12 +269,16 @@ int drop_privileges(uid_t uid, gid_t gid, uint64_t keep_capabilities) {
return log_oom(); return log_oom();
if (keep_capabilities) { if (keep_capabilities) {
cap_value_t bits[log2u64(keep_capabilities)]; cap_value_t bits[u64log2(keep_capabilities) + 1];
for (i = 0; i < ELEMENTSOF(bits); i++) for (i = 0; i < ELEMENTSOF(bits); i++)
if (keep_capabilities & (1ULL << i)) if (keep_capabilities & (1ULL << i))
bits[j++] = i; bits[j++] = i;
/* don't keep too many bits */
assert((keep_capabilities & (~1ULL << i)) == 0); assert((keep_capabilities & (~1ULL << i)) == 0);
/* don't throw away too many bits */
assert(((keep_capabilities >> i) & (~1ULL >> i)) == 0);
if (cap_set_flag(d, CAP_EFFECTIVE, j, bits, CAP_SET) < 0 || if (cap_set_flag(d, CAP_EFFECTIVE, j, bits, CAP_SET) < 0 ||
cap_set_flag(d, CAP_PERMITTED, j, bits, CAP_SET) < 0) { cap_set_flag(d, CAP_PERMITTED, j, bits, CAP_SET) < 0) {