X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=src%2Fshared%2Fcapability.c;h=915ceb9d9b1a4749206bebb638a971f7dcac156c;hb=95eb099fa8a90212ed2aef82bad360f147bc19c2;hp=57f392a4da887228c616577f63c8b37ca8ad03b5;hpb=057255fbbf2ecb1c46e025b04087fa9340d9880d;p=elogind.git diff --git a/src/shared/capability.c b/src/shared/capability.c index 57f392a4d..915ceb9d9 100644 --- a/src/shared/capability.c +++ b/src/shared/capability.c @@ -275,10 +275,10 @@ int drop_privileges(uid_t uid, gid_t gid, uint64_t keep_capabilities) { if (keep_capabilities & (1ULL << i)) bits[j++] = i; - /* don't keep too many bits */ - assert((keep_capabilities & (~1ULL << i)) == 0); - /* don't throw away too many bits */ - assert(((keep_capabilities >> i) & (~1ULL >> i)) == 0); + /* use enough bits */ + assert(i == 64 || (keep_capabilities >> i) == 0); + /* don't use too many bits */ + assert(keep_capabilities & (1ULL << (i - 1))); if (cap_set_flag(d, CAP_EFFECTIVE, j, bits, CAP_SET) < 0 || cap_set_flag(d, CAP_PERMITTED, j, bits, CAP_SET) < 0) {