X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=udev_selinux.c;h=77c0e7dc4a3de6ffbf0f695e8b5b08c40f2d4a52;hb=8127859217bcc4db6f42f8d549f157df93a44557;hp=a305e241367e18dc1fafaeebc5765e0fe4c58eeb;hpb=eb8b496e890de4ba347f78f0e7e978117ab2a479;p=elogind.git

diff --git a/udev_selinux.c b/udev_selinux.c
index a305e2413..77c0e7dc4 100644
--- a/udev_selinux.c
+++ b/udev_selinux.c
@@ -90,8 +90,7 @@ void selinux_setfilecon(const char *file, const char *devname, unsigned int mode
 		char *media;
 		int ret = -1;
 
-		if(devname)
-		{
+		if (devname) {
 			media = get_media(devname, mode);
 			if (media) {
 				ret = matchmediacon(media, &scontext);
@@ -119,10 +118,12 @@ 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)
@@ -153,6 +154,8 @@ void selinux_init(void)
 	 * restoration creation purposes.
 	 */
 	if (is_selinux_running()) {
+		if (!udev_root[0])
+			err("selinux_init: udev_root not set\n");
 		matchpathcon_init_prefix(NULL, udev_root);
 		if (getfscreatecon(&prev_scontext) < 0) {
 			err("getfscreatecon failed\n");