From: dsteklof@us.ibm.com Date: Thu, 18 Dec 2003 03:05:25 +0000 (-0800) Subject: [PATCH] fix scsi_id segfault with udev-009 X-Git-Tag: 010~25 X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ff3633bf9d192c46c457cc3819dc27ff2807ed0d;p=systemd [PATCH] fix scsi_id segfault with udev-009 Scsi_id hasn't been changed to use the latest libsysfs changes. The "directory" in the sysfs_class_device is now considered "private" and only should be accessed using functions. Treating the structures as handles lets us only load information when it's needed, reducing caching or stale information and also helping performance. Here's the problem. static inline char *sysfs_get_attr(struct sysfs_class_device *dev, const char *attr) { return sysfs_get_value_from_attributes(dev->directory->attributes, attr); } Please try this quick fix: --- diff --git a/extras/scsi_id/scsi_id.c b/extras/scsi_id/scsi_id.c index df18271b..3a34643c 100644 --- a/extras/scsi_id/scsi_id.c +++ b/extras/scsi_id/scsi_id.c @@ -133,7 +133,7 @@ static int sysfs_is_bus(const char *sysfs_path, const char *bus) return -1; snprintf(bus_dev_name, MAX_NAME_LEN, "%s/%s/%s/%s/%s", sysfs_mnt_path, - SYSFS_BUS_DIR, bus, SYSFS_DEVICES_NAME, bus_id); + SYSFS_BUS_NAME, bus, SYSFS_DEVICES_NAME, bus_id); if (stat(sysfs_path, &stat_buf)) return -1; diff --git a/extras/scsi_id/scsi_id.h b/extras/scsi_id/scsi_id.h index eb9498ab..cb27e88a 100644 --- a/extras/scsi_id/scsi_id.h +++ b/extras/scsi_id/scsi_id.h @@ -42,8 +42,14 @@ static inline char *sysfs_get_attr(struct sysfs_class_device *dev, const char *attr) { - return sysfs_get_value_from_attributes(dev->directory->attributes, - attr); + struct dlist *attributes = NULL; + + attributes = sysfs_get_classdev_attributes(dev); + + if (attributes == NULL) + return NULL; + + return sysfs_get_value_from_attributes(attributes, attr); } extern int scsi_get_serial (struct sysfs_class_device *scsi_dev,