* [PATCH] udev - fix "ignore method"
@ 2004-02-08 15:36 Kay Sievers
2004-02-09 23:41 ` Kay Sievers
2004-02-11 22:30 ` Greg KH
0 siblings, 2 replies; 3+ messages in thread
From: Kay Sievers @ 2004-02-08 15:36 UTC (permalink / raw)
To: linux-hotplug
[-- Attachment #1: Type: text/plain, Size: 166 bytes --]
We don't handle NAME="" the right way. Thanks to Emil None <emil71se@yahoo.com>
for pointing this out. Here is a fix for it and a trivial style cleanup.
thanks,
Kay
[-- Attachment #2: 01-empty-name.patch --]
[-- Type: text/plain, Size: 6130 bytes --]
===== namedev.c 1.98 vs edited =====
--- 1.98/namedev.c Tue Jan 27 22:40:29 2004
+++ edited/namedev.c Sun Feb 8 15:37:47 2004
@@ -589,12 +589,12 @@
if (dev->bus[0] != '\0') {
if (sysfs_device == NULL) {
dbg("device has no bus");
- goto no_good;
+ goto try_parent;
}
dbg("check for " FIELD_BUS " dev->bus='%s' sysfs_device->bus='%s'", dev->bus, sysfs_device->bus);
if (strcmp_pattern(dev->bus, sysfs_device->bus) != 0) {
dbg(FIELD_BUS " is not matching");
- goto no_good;
+ goto try_parent;
} else {
dbg(FIELD_BUS " matches");
}
@@ -605,7 +605,7 @@
dbg("check for " FIELD_KERNEL " dev->kernel='%s' class_dev->name='%s'", dev->kernel, class_dev->name);
if (strcmp_pattern(dev->kernel, class_dev->name) != 0) {
dbg(FIELD_KERNEL " is not matching");
- goto no_good;
+ goto try_parent;
} else {
dbg(FIELD_KERNEL " matches");
}
@@ -616,7 +616,7 @@
dbg("check " FIELD_ID);
if (match_id(dev, class_dev, sysfs_device) != 0) {
dbg(FIELD_ID " is not matching");
- goto no_good;
+ goto try_parent;
} else {
dbg(FIELD_ID " matches");
}
@@ -627,7 +627,7 @@
dbg("check " FIELD_PLACE);
if (match_place(dev, class_dev, sysfs_device) != 0) {
dbg(FIELD_PLACE " is not matching");
- goto no_good;
+ goto try_parent;
} else {
dbg(FIELD_PLACE " matches");
}
@@ -638,7 +638,7 @@
dbg("check " FIELD_SYSFS " pairs");
if (match_sysfs_pairs(dev, class_dev, sysfs_device) != 0) {
dbg(FIELD_SYSFS " is not matching");
- goto no_good;
+ goto try_parent;
} else {
dbg(FIELD_SYSFS " matches");
}
@@ -650,7 +650,7 @@
apply_format(udev, dev->program);
if (execute_program(dev->program, udev->program_result, NAME_SIZE) != 0) {
dbg(FIELD_PROGRAM " returned nozero");
- goto no_good;
+ goto try_parent;
} else {
dbg(FIELD_PROGRAM " returned successful");
}
@@ -663,22 +663,17 @@
dev->result, udev->program_result);
if (strcmp_pattern(dev->result, udev->program_result) != 0) {
dbg(FIELD_RESULT " is not matching");
- goto no_good;
+ goto try_parent;
} else {
dbg(FIELD_RESULT " matches");
}
}
- /* check if we are instructed to ignore this device */
- if (dev->name[0] == '\0') {
- dbg("instructed to ignore this device");
- return -1;
- }
-
/* Yeah, we matched! */
return 0;
-no_good:
+try_parent:
+ dbg("try parent sysfs device");
sysfs_device = sysfs_get_device_parent(sysfs_device);
if (sysfs_device == NULL)
return -ENODEV;
@@ -722,9 +717,12 @@
/* look for a matching rule to apply */
list_for_each_entry(dev, &config_device_list, node) {
dbg("process rule");
-
if (match_rule(dev, class_dev, udev, sysfs_device) == 0) {
- /* Yup, this rule belongs to us! */
+ if (dev->name[0] == '\0') {
+ dbg("instructed to ignore this device");
+ return -1;
+ }
+
info("configured rule in '%s' at line %i applied, '%s' becomes '%s'",
udev_rules_filename, dev->config_line, udev->kernel_name, dev->name);
strfieldcpy(udev->name, dev->name);
===== udev-add.c 1.42 vs edited =====
--- 1.42/udev-add.c Sat Jan 17 16:39:00 2004
+++ edited/udev-add.c Sun Feb 8 15:41:15 2004
@@ -87,7 +87,7 @@
*pos = 0x00;
if (stat(p, &stats)) {
retval = mkdir(p, 0755);
- if (retval) {
+ if (retval != 0) {
dbg("mkdir(%s) failed with error '%s'",
p, strerror(errno));
return retval;
@@ -145,17 +145,17 @@
info("creating device node '%s'", filename);
dbg("mknod(%s, %#o, %u, %u)", filename, dev->mode, dev->major, dev->minor);
retval = mknod(filename, dev->mode, res);
- if (retval)
+ if (retval != 0)
dbg("mknod(%s, %#o, %u, %u) failed with error '%s'",
filename, dev->mode, dev->major, dev->minor, strerror(errno));
dbg("chmod(%s, %#o)", filename, dev->mode);
retval = chmod(filename, dev->mode);
- if (retval)
+ if (retval != 0)
dbg("chmod(%s, %#o) failed with error '%s'",
filename, dev->mode, strerror(errno));
- if (dev->owner[0]) {
+ if (dev->owner[0] != '\0') {
char *endptr;
unsigned long id = strtoul(dev->owner, &endptr, 10);
if (endptr[0] == '\0')
@@ -169,7 +169,7 @@
}
}
- if (dev->group[0]) {
+ if (dev->group[0] != '\0') {
char *endptr;
unsigned long id = strtoul(dev->group, &endptr, 10);
if (endptr[0] == '\0')
@@ -183,16 +183,16 @@
}
}
- if (uid || gid) {
+ if (uid != 0 || gid != 0) {
dbg("chown(%s, %u, %u)", filename, uid, gid);
retval = chown(filename, uid, gid);
- if (retval)
+ if (retval != 0)
dbg("chown(%s, %u, %u) failed with error '%s'",
filename, uid, gid, strerror(errno));
}
/* create symlink if requested */
- if (dev->symlink[0]) {
+ if (dev->symlink[0] != '\0') {
symlinks = dev->symlink;
while (1) {
linkname = strsep(&symlinks, " ");
@@ -214,13 +214,13 @@
tail = i+1;
i++;
}
- while (linkname[i]) {
+ while (linkname[i] != '\0') {
if (linkname[i] == '/')
strcat(linktarget, "../");
i++;
}
- if (*linktarget == '\0')
+ if (linktarget[0] == '\0')
strcpy(linktarget, "./");
strcat(linktarget, &dev->name[tail]);
@@ -236,7 +236,7 @@
dbg("symlink(%s, %s)", linktarget, filename);
retval = symlink(linktarget, filename);
- if (retval)
+ if (retval != 0)
dbg("symlink(%s, %s) failed with error '%s'",
linktarget, filename, strerror(errno));
}
@@ -285,7 +285,7 @@
dbg("looking for '%s'", filename);
retval = stat(filename, &buf);
- if (!retval)
+ if (retval == 0)
goto exit;
/* sleep to give the kernel a chance to create the dev file */
@@ -311,7 +311,7 @@
dev.type = 'c';
retval = sleep_for_dev(path);
- if (retval)
+ if (retval != 0)
goto exit;
class_dev = get_class_dev(path);
@@ -319,13 +319,13 @@
goto exit;
retval = get_major_minor(class_dev, &dev);
- if (retval) {
+ if (retval != 0) {
dbg("get_major_minor failed");
goto exit;
}
retval = namedev_name_device(class_dev, &dev);
- if (retval)
+ if (retval != 0)
goto exit;
retval = udevdb_add_dev(path, &dev);
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH] udev - fix "ignore method"
2004-02-08 15:36 [PATCH] udev - fix "ignore method" Kay Sievers
@ 2004-02-09 23:41 ` Kay Sievers
2004-02-11 22:30 ` Greg KH
1 sibling, 0 replies; 3+ messages in thread
From: Kay Sievers @ 2004-02-09 23:41 UTC (permalink / raw)
To: linux-hotplug
[-- Attachment #1: Type: text/plain, Size: 268 bytes --]
On Sun, Feb 08, 2004 at 04:36:01PM +0100, Kay Sievers wrote:
> We don't handle NAME="" the right way. Thanks to Emil None <emil71se@yahoo.com>
> for pointing this out. Here is a fix for it and a trivial style cleanup.
Changed the ignore dbg() to info().
thanks,
Kay
[-- Attachment #2: 01-empty-name.patch --]
[-- Type: text/plain, Size: 6347 bytes --]
diff -Nru a/namedev.c b/namedev.c
--- a/namedev.c Tue Feb 10 00:39:15 2004
+++ b/namedev.c Tue Feb 10 00:39:15 2004
@@ -589,12 +589,12 @@
if (dev->bus[0] != '\0') {
if (sysfs_device == NULL) {
dbg("device has no bus");
- goto no_good;
+ goto try_parent;
}
dbg("check for " FIELD_BUS " dev->bus='%s' sysfs_device->bus='%s'", dev->bus, sysfs_device->bus);
if (strcmp_pattern(dev->bus, sysfs_device->bus) != 0) {
dbg(FIELD_BUS " is not matching");
- goto no_good;
+ goto try_parent;
} else {
dbg(FIELD_BUS " matches");
}
@@ -605,7 +605,7 @@
dbg("check for " FIELD_KERNEL " dev->kernel='%s' class_dev->name='%s'", dev->kernel, class_dev->name);
if (strcmp_pattern(dev->kernel, class_dev->name) != 0) {
dbg(FIELD_KERNEL " is not matching");
- goto no_good;
+ goto try_parent;
} else {
dbg(FIELD_KERNEL " matches");
}
@@ -616,7 +616,7 @@
dbg("check " FIELD_ID);
if (match_id(dev, class_dev, sysfs_device) != 0) {
dbg(FIELD_ID " is not matching");
- goto no_good;
+ goto try_parent;
} else {
dbg(FIELD_ID " matches");
}
@@ -627,7 +627,7 @@
dbg("check " FIELD_PLACE);
if (match_place(dev, class_dev, sysfs_device) != 0) {
dbg(FIELD_PLACE " is not matching");
- goto no_good;
+ goto try_parent;
} else {
dbg(FIELD_PLACE " matches");
}
@@ -638,7 +638,7 @@
dbg("check " FIELD_SYSFS " pairs");
if (match_sysfs_pairs(dev, class_dev, sysfs_device) != 0) {
dbg(FIELD_SYSFS " is not matching");
- goto no_good;
+ goto try_parent;
} else {
dbg(FIELD_SYSFS " matches");
}
@@ -650,7 +650,7 @@
apply_format(udev, dev->program);
if (execute_program(dev->program, udev->program_result, NAME_SIZE) != 0) {
dbg(FIELD_PROGRAM " returned nozero");
- goto no_good;
+ goto try_parent;
} else {
dbg(FIELD_PROGRAM " returned successful");
}
@@ -663,22 +663,17 @@
dev->result, udev->program_result);
if (strcmp_pattern(dev->result, udev->program_result) != 0) {
dbg(FIELD_RESULT " is not matching");
- goto no_good;
+ goto try_parent;
} else {
dbg(FIELD_RESULT " matches");
}
}
- /* check if we are instructed to ignore this device */
- if (dev->name[0] == '\0') {
- dbg("instructed to ignore this device");
- return -1;
- }
-
/* Yeah, we matched! */
return 0;
-no_good:
+try_parent:
+ dbg("try parent sysfs device");
sysfs_device = sysfs_get_device_parent(sysfs_device);
if (sysfs_device == NULL)
return -ENODEV;
@@ -722,11 +717,15 @@
/* look for a matching rule to apply */
list_for_each_entry(dev, &config_device_list, node) {
dbg("process rule");
-
if (match_rule(dev, class_dev, udev, sysfs_device) == 0) {
- /* Yup, this rule belongs to us! */
+ if (dev->name[0] == '\0') {
+ info("configured rule in '%s' at line %i applied, '%s' is ignored",
+ udev_rules_filename, dev->config_line, udev->kernel_name);
+ return -1;
+ }
+
info("configured rule in '%s' at line %i applied, '%s' becomes '%s'",
- udev_rules_filename, dev->config_line, udev->kernel_name, dev->name);
+ udev_rules_filename, dev->config_line, udev->kernel_name, dev->name);
strfieldcpy(udev->name, dev->name);
strfieldcpy(udev->symlink, dev->symlink);
goto found;
diff -Nru a/udev-add.c b/udev-add.c
--- a/udev-add.c Tue Feb 10 00:39:15 2004
+++ b/udev-add.c Tue Feb 10 00:39:15 2004
@@ -87,7 +87,7 @@
*pos = 0x00;
if (stat(p, &stats)) {
retval = mkdir(p, 0755);
- if (retval) {
+ if (retval != 0) {
dbg("mkdir(%s) failed with error '%s'",
p, strerror(errno));
return retval;
@@ -145,17 +145,17 @@
info("creating device node '%s'", filename);
dbg("mknod(%s, %#o, %u, %u)", filename, dev->mode, dev->major, dev->minor);
retval = mknod(filename, dev->mode, res);
- if (retval)
+ if (retval != 0)
dbg("mknod(%s, %#o, %u, %u) failed with error '%s'",
filename, dev->mode, dev->major, dev->minor, strerror(errno));
dbg("chmod(%s, %#o)", filename, dev->mode);
retval = chmod(filename, dev->mode);
- if (retval)
+ if (retval != 0)
dbg("chmod(%s, %#o) failed with error '%s'",
filename, dev->mode, strerror(errno));
- if (dev->owner[0]) {
+ if (dev->owner[0] != '\0') {
char *endptr;
unsigned long id = strtoul(dev->owner, &endptr, 10);
if (endptr[0] == '\0')
@@ -169,7 +169,7 @@
}
}
- if (dev->group[0]) {
+ if (dev->group[0] != '\0') {
char *endptr;
unsigned long id = strtoul(dev->group, &endptr, 10);
if (endptr[0] == '\0')
@@ -183,16 +183,16 @@
}
}
- if (uid || gid) {
+ if (uid != 0 || gid != 0) {
dbg("chown(%s, %u, %u)", filename, uid, gid);
retval = chown(filename, uid, gid);
- if (retval)
+ if (retval != 0)
dbg("chown(%s, %u, %u) failed with error '%s'",
filename, uid, gid, strerror(errno));
}
/* create symlink if requested */
- if (dev->symlink[0]) {
+ if (dev->symlink[0] != '\0') {
symlinks = dev->symlink;
while (1) {
linkname = strsep(&symlinks, " ");
@@ -214,13 +214,13 @@
tail = i+1;
i++;
}
- while (linkname[i]) {
+ while (linkname[i] != '\0') {
if (linkname[i] == '/')
strcat(linktarget, "../");
i++;
}
- if (*linktarget == '\0')
+ if (linktarget[0] == '\0')
strcpy(linktarget, "./");
strcat(linktarget, &dev->name[tail]);
@@ -236,7 +236,7 @@
dbg("symlink(%s, %s)", linktarget, filename);
retval = symlink(linktarget, filename);
- if (retval)
+ if (retval != 0)
dbg("symlink(%s, %s) failed with error '%s'",
linktarget, filename, strerror(errno));
}
@@ -285,7 +285,7 @@
dbg("looking for '%s'", filename);
retval = stat(filename, &buf);
- if (!retval)
+ if (retval == 0)
goto exit;
/* sleep to give the kernel a chance to create the dev file */
@@ -311,7 +311,7 @@
dev.type = 'c';
retval = sleep_for_dev(path);
- if (retval)
+ if (retval != 0)
goto exit;
class_dev = get_class_dev(path);
@@ -319,13 +319,13 @@
goto exit;
retval = get_major_minor(class_dev, &dev);
- if (retval) {
+ if (retval != 0) {
dbg("get_major_minor failed");
goto exit;
}
retval = namedev_name_device(class_dev, &dev);
- if (retval)
+ if (retval != 0)
goto exit;
retval = udevdb_add_dev(path, &dev);
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH] udev - fix "ignore method"
2004-02-08 15:36 [PATCH] udev - fix "ignore method" Kay Sievers
2004-02-09 23:41 ` Kay Sievers
@ 2004-02-11 22:30 ` Greg KH
1 sibling, 0 replies; 3+ messages in thread
From: Greg KH @ 2004-02-11 22:30 UTC (permalink / raw)
To: linux-hotplug
On Tue, Feb 10, 2004 at 12:41:53AM +0100, Kay Sievers wrote:
> On Sun, Feb 08, 2004 at 04:36:01PM +0100, Kay Sievers wrote:
> > We don't handle NAME="" the right way. Thanks to Emil None <emil71se@yahoo.com>
> > for pointing this out. Here is a fix for it and a trivial style cleanup.
>
> Changed the ignore dbg() to info().
Applied, thanks.
greg k-h
-------------------------------------------------------
SF.Net is sponsored by: Speed Start Your Linux Apps Now.
Build and deploy apps & Web services for Linux with
a free DVD software kit from IBM. Click Now!
http://ads.osdn.com/?ad_id\x1356&alloc_id438&op=click
_______________________________________________
Linux-hotplug-devel mailing list http://linux-hotplug.sourceforge.net
Linux-hotplug-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/linux-hotplug-devel
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2004-02-11 22:30 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2004-02-08 15:36 [PATCH] udev - fix "ignore method" Kay Sievers
2004-02-09 23:41 ` Kay Sievers
2004-02-11 22:30 ` Greg KH
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).