From 7d328b544621d4b1bec936dec612947ad8bfb65a Mon Sep 17 00:00:00 2001 From: Zbigniew Jędrzejewski-Szmek Date: Sun, 1 Feb 2015 15:26:46 -0500 Subject: shared/capability: go frugal on space for caps --- src/shared/capability.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'src/shared/capability.c') diff --git a/src/shared/capability.c b/src/shared/capability.c index dcf7ce1a69..3f2f27e23f 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) { -- cgit v1.2.3-54-g00ecf