shaba/systemd
1
0
Fork 0
mirror of https://github.com/systemd/systemd.git synced 2025-03-19 22:50:17 +03:00
Code

[PATCH] fix scsi_id segfault with udev-009

Browse Source 
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:
This commit is contained in:
dsteklof@us.ibm.com 2003-12-17 19:05:25 -08:00 committed by Greg KH
parent 77c46e9bd6
commit ff3633bf9d
2 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
extras/scsi_id/scsi_id.c
View File

@ -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;

10
extras/scsi_id/scsi_id.h
View File

@ -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,