From: greg@kroah.com <greg@kroah.com>
Date: Sat, 18 Oct 2003 02:26:07 +0000 (-0700)
Subject: [PATCH] fix segfaults when dealing with partitions.
X-Git-Tag: 004~21
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=1c596cc0a5357105a80ab07f0ebbe2eb330b2c28;p=systemd

[PATCH] fix segfaults when dealing with partitions.
---

diff --git a/udev-add.c b/udev-add.c
index 48979393..6060bcf5 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);