hotplug: fix a memory leak in handle_button_complete()

[project/procd.git] / plug / hotplug.c

diff --git a/plug/hotplug.c b/plug/hotplug.c
index b5ebd07..ce29ced 100644 (file)
--- a/plug/hotplug.c
+++ b/plug/hotplug.c
@@ -15,6 +15,7 @@
 #include <sys/stat.h>
 #include <sys/socket.h>
 #include <sys/types.h>
+#include <sys/sysmacros.h>
 
 #include <linux/types.h>
 #include <linux/netlink.h>
@@ -28,6 +29,7 @@
 #include <unistd.h>
 #include <stdlib.h>
 #include <libgen.h>
+#include <grp.h>
 
 #include "../procd.h"
 
@@ -120,16 +122,18 @@ static void mkdir_p(char *dir)
 static void handle_makedev(struct blob_attr *msg, struct blob_attr *data)
 {
        unsigned int oldumask = umask(0);
-       static struct blobmsg_policy mkdev_policy[2] = {
+       static struct blobmsg_policy mkdev_policy[3] = {
+               { .type = BLOBMSG_TYPE_STRING },
                { .type = BLOBMSG_TYPE_STRING },
                { .type = BLOBMSG_TYPE_STRING },
        };
-       struct blob_attr *tb[2];
+       struct blob_attr *tb[3];
        char *minor = hotplug_msg_find_var(msg, "MINOR");
        char *major = hotplug_msg_find_var(msg, "MAJOR");
        char *subsystem = hotplug_msg_find_var(msg, "SUBSYSTEM");
+       int ret = 0;
 
-       blobmsg_parse_array(mkdev_policy, 2, tb, blobmsg_data(data), blobmsg_data_len(data));
+       blobmsg_parse_array(mkdev_policy, 3, tb, blobmsg_data(data), blobmsg_data_len(data));
        if (tb[0] && tb[1] && minor && major && subsystem) {
                mode_t m = S_IFCHR;
                char *d = strdup(blobmsg_get_string(tb[0]));
@@ -143,6 +147,17 @@ static void handle_makedev(struct blob_attr *msg, struct blob_attr *data)
                mknod(blobmsg_get_string(tb[0]),
                                m | strtoul(blobmsg_data(tb[1]), NULL, 8),
                                makedev(atoi(major), atoi(minor)));
+               if (tb[2]) {
+                       struct group *g = getgrnam(blobmsg_get_string(tb[2]));
+
+                       if (g)
+                               ret = chown(blobmsg_get_string(tb[0]), 0, g->gr_gid);
+
+                       if (!g || ret < 0)
+                               ERROR("cannot set group %s for %s\n",
+                                       blobmsg_get_string(tb[2]),
+                                       blobmsg_get_string(tb[0]));
+               }
        }
        umask(oldumask);
 }
@@ -416,8 +431,11 @@ static void handle_button_complete(struct blob_attr *msg, struct blob_attr *data
        if (!timeout)
                return;
 
+       if (!name)
+               return;
+
        b = malloc(sizeof(*b));
-       if (!b || !name)
+       if (!b)
                return;
 
        memset(b, 0, sizeof(*b));