udev: refuse to enable inotify watch on remove event

Some udev rule may erroneously set inotify watch on remove event.
For safety, silently ignore such an inotify watch enablement.

This also moves inotify watch enablement code to udev-event.c.

1 files changed, 31 insertions, 0 deletions

diff --git a/src/udev/udev-event.c b/src/udev/udev-event.c
index 2e82be6fb3..f4dbcef959 100644
--- a/src/udev/udev-event.c
+++ b/src/udev/udev-event.c
@@ -1082,3 +1082,34 @@ void udev_event_execute_run(UdevEvent *event, usec_t timeout_usec, int timeout_s
                 }
         }
 }
+
+int udev_event_process_inotify_watch(UdevEvent *event, int inotify_fd) {
+        sd_device *dev;
+        int r;
+
+        assert(event);
+        assert(inotify_fd >= 0);
+
+        dev = event->dev;
+
+        assert(dev);
+
+        if (device_for_action(dev, SD_DEVICE_REMOVE))
+                return 0;
+
+        if (sd_device_get_devname(dev, NULL) < 0)
+                return 0;
+
+        if (!event->inotify_watch) {
+                (void) udev_watch_end(inotify_fd, dev);
+                return 0;
+        }
+
+        (void) udev_watch_begin(inotify_fd, dev);
+
+        r = device_update_db(dev);
+        if (r < 0)
+                return log_device_debug_errno(dev, r, "Failed to update database under /run/udev/data/: %m");
+
+        return 0;
+}