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 some segfaults when running udevtest for network devices.

Browse Source
This commit is contained in:
greg@kroah.com 2004-04-01 21:52:46 -08:00 committed by Greg KH
parent cfdfda1078
commit c4603a0726
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
udev-add.c
View File

@ -446,9 +446,9 @@ int udev_add_device(char *path, char *subsystem, int fake)
case 'b':
case 'c':
retval = create_node(&dev, fake);
if (fake || retval != 0)
if (retval != 0)
goto exit;
if (udevdb_add_dev(path, &dev) != 0)
if ((!fake) && (udevdb_add_dev(path, &dev) != 0))
dbg("udevdb_add_dev failed, but we are going to try "
"to create the node anyway. But remove might not "
"work properly for this device.");
@ -459,7 +459,7 @@ int udev_add_device(char *path, char *subsystem, int fake)
case 'n':
if (strcmp(dev.name, dev.kernel_name) != 0) {
retval = rename_net_if(&dev, fake);
if (fake || retval != 0)
if (retval != 0)
goto exit;
/* netif's are keyed with the configured name, cause
* the original kernel name sleeps with the fishes
@ -471,7 +471,7 @@ int udev_add_device(char *path, char *subsystem, int fake)
strfieldcat(devpath, dev.name);
}
}
if (udevdb_add_dev(devpath, &dev) != 0)
if ((!fake) && (udevdb_add_dev(devpath, &dev) != 0))
dbg("udevdb_add_dev failed");
dev_d_send(&dev, subsystem, devpath);