X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=src%2Fshared%2Fcapability.c;h=8dbe4da5bbbe1280518e81bca9af166549f06bf1;hb=db507ae23a34aa47404cd95e73a7af3414498ff9;hp=57f392a4da887228c616577f63c8b37ca8ad03b5;hpb=057255fbbf2ecb1c46e025b04087fa9340d9880d;p=elogind.git

diff --git a/src/shared/capability.c b/src/shared/capability.c
index 57f392a4d..8dbe4da5b 100644
--- a/src/shared/capability.c
+++ b/src/shared/capability.c
@@ -19,14 +19,9 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 
-#include <assert.h>
-#include <string.h>
 #include <unistd.h>
 #include <errno.h>
 #include <stdio.h>
-#include <sys/types.h>
-#include <stdarg.h>
-#include <ctype.h>
 #include <sys/capability.h>
 #include <sys/prctl.h>
 #include "grp.h"
@@ -55,7 +50,7 @@ unsigned long cap_last_cap(void) {
         static thread_local unsigned long saved;
         static thread_local bool valid = false;
         _cleanup_free_ char *content = NULL;
-        unsigned long p;
+        unsigned long p = 0;
         int r;
 
         if (valid)
@@ -209,7 +204,7 @@ static int drop_from_file(const char *fn, uint64_t drop) {
         if (asprintf(&p, "%u %u", lo, hi) < 0)
                 return -ENOMEM;
 
-        r = write_string_file(fn, p);
+        r = write_string_file(fn, p, WRITE_STRING_FILE_CREATE);
         free(p);
 
         return r;
@@ -275,10 +270,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) {