From: Lennart Poettering <lennart@poettering.net>
Date: Tue, 16 Oct 2018 11:48:25 +0000 (+0200)
Subject: udev: don't use devname before we acquired it
X-Git-Tag: v240~544^2~1
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=eb276e98419af59d4a587f2dd37e0b923e4c6fd2;p=thirdparty%2Fsystemd.git

udev: don't use devname before we acquired it

CID 1396107
---

diff --git a/src/udev/udev-watch.c b/src/udev/udev-watch.c
index cfcb310d231..04182b2e151 100644
--- a/src/udev/udev-watch.c
+++ b/src/udev/udev-watch.c
@@ -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);