diff options
author | Kay Sievers <kay.sievers@vrfy.org> | 2008-09-01 10:21:05 +0200 |
---|---|---|
committer | Kay Sievers <kay.sievers@vrfy.org> | 2008-09-01 10:21:05 +0200 |
commit | 424756eda38b13d853fa8a392d6f0df3e4e802ae (patch) | |
tree | d79f74091885e31ff1cfff35d9cf37fa6c7f32de /udev | |
parent | ac877d7cf46e25bd50d17450e74f3b0346a8d5a1 (diff) |
fix dangling pointer returned by attr_get_by_subsys_id()
Thanks to Alan Jenkins <alan-jenkins@tuffmail.co.uk> for
finding this.
Diffstat (limited to 'udev')
-rw-r--r-- | udev/udev_rules.c | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/udev/udev_rules.c b/udev/udev_rules.c index 693bce261c..557513afcc 100644 --- a/udev/udev_rules.c +++ b/udev/udev_rules.c @@ -569,27 +569,29 @@ static int wait_for_file(struct udevice *udev, const char *file, int timeout) static int attr_get_by_subsys_id(const char *attrstr, char *devpath, size_t len, char **attr) { char subsys[NAME_SIZE]; - char *attrib; + char *pos; char *id; + char *attrib; int found = 0; if (attrstr[0] != '[') goto out; - strlcpy(subsys, &attrstr[1], sizeof(subsys)); - - attrib = strchr(subsys, ']'); + attrib = strchr(&attrstr[1], ']'); if (attrib == NULL) goto out; - attrib[0] = '\0'; attrib = &attrib[1]; + strlcpy(subsys, &attrstr[1], sizeof(subsys)); + pos = strchr(subsys, ']'); + if (pos == NULL) + goto out; + pos[0] = '\0'; id = strchr(subsys, '/'); if (id == NULL) goto out; id[0] = '\0'; id = &id[1]; - if (sysfs_lookup_devpath_by_subsys_id(devpath, len, subsys, id)) { if (attr != NULL) { if (attrib[0] != '\0') |