release 117

[elogind.git] / udev_selinux.c

diff --git a/udev_selinux.c b/udev_selinux.c
index b802e1fc6ee36016824db6968129ee0041839e37..3fa84a0d434dcb5f1bc94aff682a85f642552f03 100644 (file)
--- a/udev_selinux.c
+++ b/udev_selinux.c
@@ -24,8 +24,8 @@
 #include <fcntl.h>
 #include <ctype.h>
 #include <limits.h>
-#include <libgen.h>
 #include <errno.h>
+#include <sys/stat.h>
 #include <selinux/selinux.h>
 
 #include "udev.h"
@@ -75,7 +75,7 @@ static char *get_media(const char *devname, int mode)
        }
 
        media = strdup(mediabuf);
-       info("selinux_get_media(%s)='%s'\n", devname, media);
+       info("selinux_get_media(%s)='%s'", devname, media);
 
 close_out:
        fclose(fp);
@@ -90,19 +90,21 @@ void selinux_setfilecon(const char *file, const char *devname, unsigned int mode
                char *media;
                int ret = -1;
 
-               media = get_media(devname, mode);
-               if (media) {
-                       ret = matchmediacon(media, &scontext);
-                       free(media);
+               if (devname) {
+                       media = get_media(devname, mode);
+                       if (media) {
+                               ret = matchmediacon(media, &scontext);
+                               free(media);
+                       }
                }
 
                if (ret < 0)
                        if (matchpathcon(file, mode, &scontext) < 0) {
-                               err("matchpathcon(%s) failed\n", file);
+                               err("matchpathcon(%s) failed", file);
                                return;
                        } 
 
-               if (setfilecon(file, scontext) < 0)
+               if (lsetfilecon(file, scontext) < 0)
                        err("setfilecon %s failed: %s", file, strerror(errno));
 
                freecon(scontext);
@@ -116,15 +118,17 @@ void selinux_setfscreatecon(const char *file, const char *devname, unsigned int
                char *media;
                int ret = -1;
 
-               media = get_media(devname, mode);
-               if (media) {
-                       ret = matchmediacon(media, &scontext);
-                       free(media);
+               if (devname) {
+                       media = get_media(devname, mode);
+                       if (media) {
+                               ret = matchmediacon(media, &scontext);
+                               free(media);
+                       }
                }
 
                if (ret < 0)
                        if (matchpathcon(file, mode, &scontext) < 0) {
-                               err("matchpathcon(%s) failed\n", file);
+                               err("matchpathcon(%s) failed", file);
                                return;
                        }
 
@@ -150,9 +154,11 @@ void selinux_init(void)
         * restoration creation purposes.
         */
        if (is_selinux_running()) {
+               if (!udev_root[0])
+                       err("selinux_init: udev_root not set");
                matchpathcon_init_prefix(NULL, udev_root);
                if (getfscreatecon(&prev_scontext) < 0) {
-                       err("getfscreatecon failed\n");
+                       err("getfscreatecon failed");
                        prev_scontext = NULL;
                }
        }