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

udev: don't use devname before we acquired it

Browse source 
CID 1396107
This commit is contained in:
Lennart Poettering 2018-10-16 13:48:25 +02:00
parent cdc2af3e15
commit eb276e9841
1 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/udev/udev-watch.c
View file

@ -127,16 +127,16 @@ int udev_watch_end(sd_device *dev) {
if (inotify_fd < 0)
return log_error_errno(EINVAL, "Invalid inotify descriptor.");
r = sd_device_get_devname(dev, &devnode);
if (r < 0)
return log_error_errno(r, "Failed to get device name: %m");
r = device_get_watch_handle(dev, &wd);
if (r == -ENOENT)
return 0;
if (r < 0)
return log_error_errno(r, "Failed to get watch handle for device '%s', ignoring: %m", devnode);
r = sd_device_get_devname(dev, &devnode);
if (r < 0)
return log_error_errno(r, "Failed to get device name: %m");
log_debug("Removing watch on '%s'", devnode);
(void) inotify_rm_watch(inotify_fd, wd);