src/basic/inotify-util.h

@@ -12,12 +12,15 @@
 
 #define _FOREACH_INOTIFY_EVENT(e, buffer, sz, log_level, start, end)    \
         for (struct inotify_event                                       \
-                     *start = &((buffer).ev),                           \
+                            *start = &((buffer).ev),                    \
                      *end = (struct inotify_event*) ((uint8_t*) start + (sz)), \
                      *e = start;                                        \
-             (size_t) ((uint8_t*) end - (uint8_t*) e) >= sizeof(struct inotify_event) && \
-             ((size_t) ((uint8_t*) end - (uint8_t*) e) >= sizeof(struct inotify_event) + e->len || \
-              (log_full(log_level, "Received invalid inotify event, ignoring."), false)); \
+             (uint8_t*) e + sizeof(struct inotify_event) <= (uint8_t*) end && \
+             (uint8_t*) e + sizeof(struct inotify_event) + e->len <= (uint8_t*) end ? true : \
+                     ({                                                 \
+                             log_full(log_level, "Received invalid inotify event, ignoring."); \
+                             false;                                     \
+                     });                                                \
              e = (struct inotify_event*) ((uint8_t*) e + sizeof(struct inotify_event) + e->len))
 
 #define _FOREACH_INOTIFY_EVENT_FULL(e, buffer, sz, log_level)           \

src/udev/udevd.c

@@ -210,10 +210,8 @@ DEFINE_PRIVATE_HASH_OPS_WITH_VALUE_DESTRUCTOR(worker_hash_op, void, trivial_hash
 static void manager_clear_for_worker(Manager *manager) {
         assert(manager);
 
-        /* Do not use sd_event_source_disable_unref() here, as this is called by both workers and the
-         * main process. */
-        manager->inotify_event = sd_event_source_unref(manager->inotify_event);
-        manager->kill_workers_event = sd_event_source_unref(manager->kill_workers_event);
+        manager->inotify_event = sd_event_source_disable_unref(manager->inotify_event);
+        manager->kill_workers_event = sd_event_source_disable_unref(manager->kill_workers_event);
 
         manager->event = sd_event_unref(manager->event);