X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=src%2Fshared%2Fcapability.c;h=3f2f27e23fe4234c2660da30e5d99f76549aff14;hp=dcf7ce1a69ec58b252c4dcf1bc06ace259b5c48e;hb=7d328b544621d4b1bec936dec612947ad8bfb65a;hpb=51ddf61540976fc7b09ce5ace707b27f3acc3871;ds=inline diff --git a/src/shared/capability.c b/src/shared/capability.c index dcf7ce1a6..3f2f27e23 100644 --- a/src/shared/capability.c +++ b/src/shared/capability.c @@ -269,11 +269,12 @@ int drop_privileges(uid_t uid, gid_t gid, uint64_t keep_capabilities) { return log_oom(); if (keep_capabilities) { - cap_value_t bits[sizeof(keep_capabilities)*8]; + cap_value_t bits[log2u64(keep_capabilities)]; - for (i = 0; i < sizeof(keep_capabilities)*8; i++) + for (i = 0; i < ELEMENTSOF(bits); i++) if (keep_capabilities & (1ULL << i)) bits[j++] = i; + assert((keep_capabilities & (~1ULL << i)) == 0); if (cap_set_flag(d, CAP_EFFECTIVE, j, bits, CAP_SET) < 0 || cap_set_flag(d, CAP_PERMITTED, j, bits, CAP_SET) < 0) {