From 1c596cc0a5357105a80ab07f0ebbe2eb330b2c28 Mon Sep 17 00:00:00 2001 From: "greg@kroah.com" Date: Fri, 17 Oct 2003 19:26:07 -0700 Subject: [PATCH] [PATCH] fix segfaults when dealing with partitions. --- udev-add.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/udev-add.c b/udev-add.c index 48979393a5..6060bcf5f7 100644 --- a/udev-add.c +++ b/udev-add.c @@ -169,13 +169,13 @@ int udev_add_device(char *device, char *subsystem) } memset(&dbdev, 0, sizeof(dbdev)); strncpy(dbdev.name, attr.name, NAME_SIZE); - strncpy(dbdev.sysfs_path, class_dev->sysdevice->directory->path, - PATH_SIZE); + if (class_dev->sysdevice) { + strncpy(dbdev.sysfs_path, class_dev->sysdevice->directory->path, PATH_SIZE); + strncpy(dbdev.bus_id, class_dev->sysdevice->bus_id, ID_SIZE); + } strncpy(dbdev.class_dev_name, class_dev->name, NAME_SIZE); - if ((sysfs_get_name_from_path(subsystem, dbdev.class_name, NAME_SIZE)) - != 0) + if ((sysfs_get_name_from_path(subsystem, dbdev.class_name, NAME_SIZE)) != 0) strcpy(dbdev.class_name, "unkown"); - strncpy(dbdev.bus_id, class_dev->sysdevice->bus_id, ID_SIZE); strcpy(dbdev.bus_name, "unknown"); if (class_dev->driver != NULL) strncpy(dbdev.driver, class_dev->driver->name, NAME_SIZE);