X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=src%2Flabel.c;h=b7bb03322fbc49693d8d7069a66ba523833ec862;hb=6c7506dca32f8add56cd03bf263f417305de74a0;hp=d037c4c93215bfe67b84439b5eb27c3100c41123;hpb=5c0532d1cc989d2f78d2cd4a18058daa58143705;p=elogind.git

diff --git a/src/label.c b/src/label.c
index d037c4c93..b7bb03322 100644
--- a/src/label.c
+++ b/src/label.c
@@ -22,6 +22,7 @@
 #include <errno.h>
 #include <sys/stat.h>
 #include <unistd.h>
+#include <malloc.h>
 
 #include "label.h"
 #include "util.h"
@@ -47,6 +48,8 @@ int label_init(void) {
         int r = 0;
 
 #ifdef HAVE_SELINUX
+        usec_t n;
+        struct mallinfo before;
 
         if (!use_selinux())
                 return 0;
@@ -54,18 +57,34 @@ int label_init(void) {
         if (label_hnd)
                 return 0;
 
+        before = mallinfo();
+        n = now(CLOCK_MONOTONIC);
+
         label_hnd = selabel_open(SELABEL_CTX_FILE, NULL, 0);
         if (!label_hnd) {
                 log_full(security_getenforce() == 1 ? LOG_ERR : LOG_DEBUG,
                          "Failed to initialize SELinux context: %m");
                 r = security_getenforce() == 1 ? -errno : 0;
+        } else  {
+                char buf[FORMAT_TIMESPAN_MAX];
+                struct mallinfo after;
+                int l;
+
+                n = now(CLOCK_MONOTONIC) - n;
+                after = mallinfo();
+
+                l = after.uordblks > before.uordblks ? after.uordblks - before.uordblks : 0;
+
+                log_info("Successfully loaded SELinux database in %s, size on heap is %iK.",
+                         format_timespan(buf, sizeof(buf), n),
+                         l/1024);
         }
 #endif
 
         return r;
 }
 
-int label_fix(const char *path) {
+int label_fix(const char *path, bool ignore_enoent) {
         int r = 0;
 
 #ifdef HAVE_SELINUX
@@ -94,6 +113,10 @@ int label_fix(const char *path) {
         }
 
         if (r < 0) {
+                /* Ignore ENOENT in some cases */
+                if (ignore_enoent && errno == ENOENT)
+                        return 0;
+
                 log_full(security_getenforce() == 1 ? LOG_ERR : LOG_DEBUG,
                          "Unable to fix label of %s: %m", path);
                 r = security_getenforce() == 1 ? -errno : 0;
@@ -258,20 +281,15 @@ int label_mkdir(
 
         if (use_selinux() && label_hnd) {
 
-                if (path[0] == '/')
+                if (path_is_absolute(path))
                         r = selabel_lookup_raw(label_hnd, &fcon, path, mode);
                 else {
-                        char *cwd = NULL, *newpath = NULL;
-
-                        cwd = get_current_dir_name();
+                        char *newpath = NULL;
 
-                        if (cwd || asprintf(&newpath, "%s/%s", cwd, path) < 0) {
-                                free(cwd);
-                                return -errno;
-                        }
+                        if (!(newpath = path_make_absolute_cwd(path)))
+                                return -ENOMEM;
 
                         r = selabel_lookup_raw(label_hnd, &fcon, newpath, mode);
-                        free(cwd);
                         free(newpath);
                 }