fix 'unknow user' error from getpwnam/getgrnam

[elogind.git] / udevd.c

diff --git a/udevd.c b/udevd.c
index 5c51beed1e0d32d85a3d1332df28bfff19f964e9..3da56ca2944c529c73491561ff2562438580ca3b 100644 (file)
--- a/udevd.c
+++ b/udevd.c
@@ -45,6 +45,7 @@
 #include "udev.h"
 #include "udev_rules.h"
 #include "udevd.h"
+#include "udev_selinux.h"
 
 static struct udev_rules rules;
 static int udevd_sock = -1;
@@ -565,6 +566,7 @@ static struct udevd_uevent_msg *get_msg_from_envbuf(const char *buf, int buf_siz
        int bufpos;
        int i;
        struct udevd_uevent_msg *msg;
+       char *physdevdriver_key = NULL;
        int major = 0;
        int minor = 0;
 
@@ -599,6 +601,8 @@ static struct udevd_uevent_msg *get_msg_from_envbuf(const char *buf, int buf_siz
                        msg->seqnum = strtoull(&key[7], NULL, 10);
                else if (strncmp(key, "PHYSDEVPATH=", 12) == 0)
                        msg->physdevpath = &key[12];
+               else if (strncmp(key, "PHYSDEVDRIVER=", 14) == 0)
+                       physdevdriver_key = key;
                else if (strncmp(key, "MAJOR=", 6) == 0)
                        major = strtoull(&key[6], NULL, 10);
                else if (strncmp(key, "MINOR=", 6) == 0)
@@ -608,6 +612,13 @@ static struct udevd_uevent_msg *get_msg_from_envbuf(const char *buf, int buf_siz
        }
        msg->devt = makedev(major, minor);
        msg->envp[i++] = "UDEVD_EVENT=1";
+
+       if (msg->driver == NULL && msg->physdevpath == NULL && physdevdriver_key != NULL) {
+               /* for older kernels DRIVER is empty for a bus device, export PHYSDEVDRIVER as DRIVER */
+               msg->envp[i++] = &physdevdriver_key[7];
+               msg->driver = &physdevdriver_key[14];
+       }
+
        msg->envp[i] = NULL;
 
        if (msg->devpath == NULL || msg->action == NULL) {
@@ -931,6 +942,7 @@ int main(int argc, char *argv[], char *envp[])
                err("fatal, could not open /dev/null: %s", strerror(errno));
 
        udev_config_init();
+       selinux_init();
        dbg("version %s", UDEV_VERSION);
 
        if (getuid() != 0) {