File 1024-udev-always-close-lock-file-descriptor.patch of Package systemd-mini.1472

Overview Repositories Revisions Requests Users Attributes Meta

File 1024-udev-always-close-lock-file-descriptor.patch of Package systemd-mini.1472

Based on 3d06f4183470d42361303086ed9dedd29c0ffc1b Mon Sep 17 00:00:00 2001
From: Kay Sievers <kay@vrfy.org>
Date: Tue, 3 Jun 2014 10:46:51 +0200
Subject: [PATCH] udev: always close lock file descriptor

https://bugs.freedesktop.org/show_bug.cgi?id=79576
---
 src/udev/udevd.c |    7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

--- src/udev/udevd.c
+++ src/udev/udevd.c	2014-06-03 15:34:42.778346368 +0000
@@ -301,6 +301,7 @@ static void worker_new(struct event *eve
                                         if (fd_lock >= 0 && flock(fd_lock, LOCK_SH|LOCK_NB) < 0) {
                                                 log_debug("Unable to flock(%s), skipping event handling: %m", udev_device_get_devnode(d));
                                                 err = -EWOULDBLOCK;
+                                                close_nointr_nofail(fd_lock); fd_lock = -1;
                                                 goto skip;
                                         }
                                 }
@@ -318,7 +319,7 @@ static void worker_new(struct event *eve
                         }
 
                         if (fd_lock >= 0)
-                                close(fd_lock);
+                                close_nointr_nofail(fd_lock);
 
                         /* send processed event back to libudev listeners */
                         udev_monitor_send_device(worker_monitor, NULL, dev);
@@ -378,9 +379,9 @@ skip:
 out:
                 udev_device_unref(dev);
                 if (fd_signal >= 0)
-                        close(fd_signal);
+                        close_nointr_nofail(fd_signal);
                 if (fd_ep >= 0)
-                        close(fd_ep);
+                        close_nointr_nofail(fd_ep);
                 close(fd_inotify);
                 close(worker_watch[WRITE_END]);
                 udev_rules_unref(rules);

Places

File 1024-udev-always-close-lock-file-descriptor.patch of Package systemd-mini.1472

Places