picnoir/Systemd
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

udev-event: check whether device has devnum before calling udev_node_remove()

Browse source 
This fixes a bug in 'remove' event handling, which was introduced by
eb1f9e30ec, as 'devnum' variable may
not be initialized.
This commit is contained in:
Yu Watanabe 2018-10-29 12:38:40 +09:00
parent 5061dfa850
commit d4a95a952e
1 changed files with 2 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
src/udev/udev-event.c
View file

@ -782,7 +782,6 @@ static void event_execute_rules_on_remove(
struct udev_rules *rules) {
sd_device *dev = event->dev->device;
dev_t devnum;
int r;
r = device_read_db_force(dev);
@ -797,18 +796,14 @@ static void event_execute_rules_on_remove(
if (r < 0)
log_device_debug_errno(dev, r, "Failed to delete database under /run/udev/data/, ignoring: %m");
r = sd_device_get_devnum(dev, &devnum);
if (r < 0) {
if (r != -ENOENT)
log_device_debug_errno(dev, r, "Failed to get devnum, ignoring: %m");
} else
if (sd_device_get_devnum(dev, NULL) >= 0)
(void) udev_watch_end(dev);
(void) udev_rules_apply_to_event(rules, event,
timeout_usec, timeout_warn_usec,
properties_list);
if (major(devnum) > 0)
if (sd_device_get_devnum(dev, NULL) >= 0)
(void) udev_node_remove(dev);
}