[PATCH] udev - safer string handling - part four

[elogind.git] / namedev.c

diff --git a/namedev.c b/namedev.c
index 186a9f5cc25fdec1afa5bb4d51d71c495300d55d..21f52d1f3cfa31811110997d762be77e12744a1d 100644 (file)
--- a/namedev.c
+++ b/namedev.c
@@ -33,12 +33,12 @@
 #include <sys/wait.h>
 #include <sys/stat.h>
 
+#include "libsysfs/sysfs/libsysfs.h"
 #include "list.h"
 #include "udev.h"
 #include "udev_version.h"
 #include "logging.h"
 #include "namedev.h"
-#include "libsysfs/libsysfs.h"
 #include "klibc_fixups.h"
 
 static struct sysfs_attribute *find_sysfs_attribute(struct sysfs_class_device *class_dev, struct sysfs_device *sysfs_device, char *attr);
@@ -157,7 +157,7 @@ static mode_t get_default_mode(void)
 static char *get_default_owner(void)
 {
        if (strlen(default_owner_str) == 0)
-               strncpy(default_owner_str, "root", OWNER_SIZE);
+               strfieldcpy(default_owner_str, "root");
 
        return default_owner_str;
 }
@@ -165,7 +165,7 @@ static char *get_default_owner(void)
 static char *get_default_group(void)
 {
        if (strlen(default_group_str) == 0)
-               strncpy(default_group_str, "root", GROUP_SIZE);
+               strfieldcpy(default_group_str, "root");
 
        return default_group_str;
 }
@@ -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,19 +247,19 @@ 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':
@@ -276,7 +278,7 @@ static void apply_format(struct udevice *udev, unsigned char *string, struct sys
                        if (attr != NULL)
                                i = atoi(attr);
                        if (i > 0) {
-                               strncpy(temp1, udev->program_result, sizeof(temp1));
+                               strfieldcpy(temp1, udev->program_result);
                                pos2 = temp1;
                                while (i) {
                                        i--;
@@ -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;
@@ -462,7 +464,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);
                        }
                }
@@ -623,7 +625,8 @@ static struct sysfs_device *get_sysfs_device(struct sysfs_class_device *class_de
        tspec.tv_nsec = 10000000;  /* sleep 10 millisec */
        loop = 10;
        while (loop--) {
-               nanosleep(&tspec, NULL);
+               if (udev_sleep)
+                       nanosleep(&tspec, NULL);
                if (class_dev_parent)
                        sysfs_device = sysfs_get_classdev_device(class_dev_parent);
                else
@@ -650,7 +653,8 @@ device_found:
                loop = 10;
                tspec.tv_nsec = 10000000;
                while (loop--) {
-                       nanosleep(&tspec, NULL);
+                       if (udev_sleep)
+                               nanosleep(&tspec, NULL);
                        sysfs_get_device_bus(sysfs_device);
                        
                        if (sysfs_device->bus[0] != '\0')
@@ -731,7 +735,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;
@@ -823,8 +828,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);
@@ -835,8 +842,8 @@ done:
        } else {
                /* no matching perms found :( */
                udev->mode = get_default_mode();
-               strncpy(udev->owner, get_default_owner(), OWNER_SIZE);
-               strncpy(udev->group, get_default_group(), GROUP_SIZE);
+               strfieldcpy(udev->owner, get_default_owner());
+               strfieldcpy(udev->group, get_default_group());
        }
        dbg("name, '%s' is going to have owner='%s', group='%s', mode = %#o",
            udev->name, udev->owner, udev->group, udev->mode);