[PATCH] bug in udev-remove.c

Uups, we have a bug in udev-remove.c.

udev segfaults with NULL-pointer, if the device is not in the database:

  ./test.block: line 29:  4844 Segmentation fault      $BIN block
  Dec 17 22:47:42 pim udev[4882]: udev_remove_device: '/block/sdy' not found in database, falling back on default name
  Dec 17 22:47:42 pim udev[4882]: udev_remove_device: name is '(null)'

diff --git a/udev-remove.c b/udev-remove.c
index 0886c23343e0a7ee98fe8539cd130ff6783034ed..dad4a98570251f9a6cadacf8a05bac3fff722ece 100644 (file)
--- a/udev-remove.c
+++ b/udev-remove.c
@@ -118,8 +118,8 @@ static int delete_node(struct udevice *dev)
  */
 int udev_remove_device(char *path, char *subsystem)
 {
-       char name[100];
        struct udevice *dev;
+       struct udevice device;
        char *temp;
 
        dev = udevdb_get_dev(path);
@@ -128,13 +128,15 @@ int udev_remove_device(char *path, char *subsystem)
                temp = strrchr(path, '/');
                if (temp == NULL)
                        return -ENODEV;
-               strncpy(name, &temp[1], sizeof(name));
+               memset(&device, 0, sizeof(device));
+               dev = &device;
+               strncpy(device.name, &temp[1], sizeof(device.name));
        }
 
        dbg("name is '%s'", dev->name);
        udevdb_delete_dev(path);
 
-       sysbus_send_remove(name, path);
+       sysbus_send_remove(dev->name, path);
 
        return delete_node(dev);
 }