[PATCH] udev - kill udevd on install

[elogind.git] / namedev.c

diff --git a/namedev.c b/namedev.c
index 219cb8a4b84406b63f7cfcf8917eb08fcb9eee66..581a7f2218ca08973d90bef696ba45d1132f2a36 100644 (file)
--- a/namedev.c
+++ b/namedev.c
@@ -209,7 +209,9 @@ static int get_format_len(char **str)
        return -1;
 }
 
-static void apply_format(struct udevice *udev, unsigned char *string, struct sysfs_class_device *class_dev, struct sysfs_device *sysfs_device)
+static void apply_format(struct udevice *udev, char *string, size_t maxsize,
+                        struct sysfs_class_device *class_dev,
+                        struct sysfs_device *sysfs_device)
 {
        char temp[NAME_SIZE];
        char temp1[NAME_SIZE];
@@ -226,7 +228,7 @@ static void apply_format(struct udevice *udev, unsigned char *string, struct sys
        pos = string;
 
        while (1) {
-               pos = strchr(pos, '%');
+               pos = strchr(string, '%');
                if (pos != NULL) {
                        pos[0] = '\0';
                        tail = pos+1;
@@ -245,27 +247,27 @@ static void apply_format(struct udevice *udev, unsigned char *string, struct sys
                case 'b':
                        if (strlen(udev->bus_id) == 0)
                                break;
-                       strcat(pos, udev->bus_id);
+                       strnfieldcat(string, udev->bus_id, maxsize);
                        dbg("substitute bus_id '%s'", udev->bus_id);
                        break;
                case 'k':
                        if (strlen(udev->kernel_name) == 0)
                                break;
-                       strcat(pos, udev->kernel_name);
+                       strnfieldcat(string, udev->kernel_name, maxsize);
                        dbg("substitute kernel name '%s'", udev->kernel_name);
                        break;
                case 'n':
                        if (strlen(udev->kernel_number) == 0)
                                break;
-                       strcat(pos, udev->kernel_number);
+                       strnfieldcat(string, udev->kernel_number, maxsize);
                        dbg("substitute kernel number '%s'", udev->kernel_number);
                                break;
                case 'm':
-                       sprintf(pos, "%u", udev->minor);
+                       strnintcat(string, udev->minor, maxsize);
                        dbg("substitute minor number '%u'", udev->minor);
                        break;
-                       case 'M':
-                       sprintf(pos, "%u", udev->major);
+               case 'M':
+                       strnintcat(string, udev->major, maxsize);
                        dbg("substitute major number '%u'", udev->major);
                        break;
                case 'c':
@@ -287,11 +289,11 @@ static void apply_format(struct udevice *udev, unsigned char *string, struct sys
                                        }
                                }
                                if (pos3) {
-                                       strcat(pos, pos3);
+                                       strnfieldcat(string, pos3, maxsize);
                                        dbg("substitute part of result string '%s'", pos3);
                                }
                        } else {
-                               strcat(pos, udev->program_result);
+                               strnfieldcat(string, udev->program_result, maxsize);
                                dbg("substitute result string '%s'", udev->program_result);
                        }
                        break;
@@ -302,20 +304,20 @@ static void apply_format(struct udevice *udev, unsigned char *string, struct sys
                                        dbg("sysfa attribute '%s' not found", attr);
                                        break;
                                }
-                               strcpy(pos, tmpattr->value);
+                               strnfieldcat(string, tmpattr->value, maxsize);
                                dbg("substitute sysfs value '%s'", tmpattr->value);
                        } else {
                                dbg("missing attribute");
                        }
                        break;
                case '%':
-                       strcat(pos, "%");
+                       strnfieldcat(string, "%", maxsize);
                        break;
                default:
                        dbg("unknown substitution type '%%%c'", c);
                        break;
                }
-               strcat(pos, tail);
+               strnfieldcat(string, tail, maxsize);
        }
 }
 
@@ -403,7 +405,7 @@ static int execute_program(char *path, char *value, int len)
        int fds[2];
        pid_t pid;
        int value_set = 0;
-       char buffer[256];
+       char buffer[255];
        char *pos;
        char *args[PROGRAM_MAXARG];
        int i;
@@ -419,7 +421,13 @@ static int execute_program(char *path, char *value, int len)
        case 0:
                /* child */
                close(STDOUT_FILENO);
-               dup(fds[1]);    /* dup write side of pipe to STDOUT */
+
+               /* dup write side of pipe to STDOUT */
+               dup(fds[1]);
+
+               /* copy off our path to use incase we have too many args */
+               strnfieldcpy(buffer, path, sizeof(buffer));
+
                if (strchr(path, ' ')) {
                        /* exec with arguments */
                        pos = path;
@@ -429,14 +437,16 @@ static int execute_program(char *path, char *value, int len)
                                        break;
                        }
                        if (args[i]) {
-                               dbg("too many args - %d", i);
-                               args[i] = NULL;
+                               dbg("too many args - %d, using subshell instead '%s'", i, buffer);
+                               retval = execl("/bin/sh", "sh", "-c", buffer, NULL);
+                       } else {
+                               dbg("execute program '%s'", path);
+                               retval = execv(args[0], args);
                        }
-                       retval = execv(args[0], args);
                } else {
                        retval = execv(path, main_argv);
                }
-               dbg("child execve failed");
+               info(FIELD_PROGRAM " execution of '%s' failed", path);
                exit(1);
        case -1:
                dbg("fork failed");
@@ -462,7 +472,7 @@ static int execute_program(char *path, char *value, int len)
                                strncpy(value, buffer, len);
                                pos = value + strlen(value)-1;
                                if (pos[0] == '\n')
-                               pos[0] = '\0';
+                                       pos[0] = '\0';
                                dbg("result is '%s'", value);
                        }
                }
@@ -733,7 +743,8 @@ static int match_rule(struct config_device *dev, struct sysfs_class_device *clas
                /* execute external program */
                if (dev->program[0] != '\0') {
                        dbg("check " FIELD_PROGRAM);
-                       apply_format(udev, dev->program, class_dev, sysfs_device);
+                       apply_format(udev, dev->program, sizeof(dev->program),
+                                    class_dev, sysfs_device);
                        if (execute_program(dev->program, udev->program_result, NAME_SIZE) != 0) {
                                dbg(FIELD_PROGRAM " returned nozero");
                                goto try_parent;
@@ -825,8 +836,10 @@ int namedev_name_device(struct sysfs_class_device *class_dev, struct udevice *ud
 
 found:
        /* substitute placeholder */
-       apply_format(udev, udev->name, class_dev, sysfs_device);
-       apply_format(udev, udev->symlink, class_dev, sysfs_device);
+       apply_format(udev, udev->name, sizeof(udev->name),
+                    class_dev, sysfs_device);
+       apply_format(udev, udev->symlink, sizeof(udev->symlink),
+                    class_dev, sysfs_device);
        udev->partitions = dev->partitions;
 done:
        perm = find_perm(udev->name);