pool/systemd
SHA256
2
0
Fork 1
Code Issues Pull Requests Packages Projects Releases Wiki Activity

.

Browse Source 
OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=655
This commit is contained in:
Dr. Werner Fink 2014-06-03 15:41:13 +00:00 committed by Git OBS Bridge
parent 27ff257b45
commit eb0eb3e60f
1 changed files with 12 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
1024-udev-always-close-lock-file-descriptor.patch
View File

@ -5,14 +5,12 @@ Subject: [PATCH] udev: always close lock file descriptor
https://bugs.freedesktop.org/show_bug.cgi?id=79576 https://bugs.freedesktop.org/show_bug.cgi?id=79576
--- ---
src/udev/udevd.c | 10 ++++------ src/udev/udevd.c | 7 ++++---
1 file changed, 4 insertions(+), 6 deletions(-) 1 file changed, 4 insertions(+), 3 deletions(-)
diff --git src/udev/udevd.c src/udev/udevd.c
index 1c9488e..819ea3b 100644
--- src/udev/udevd.c --- src/udev/udevd.c
+++ 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 *event) @@ -301,6 +301,7 @@ static void worker_new(struct event *eve
if (fd_lock >= 0 && flock(fd_lock, LOCK_SH|LOCK_NB) < 0) { 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)); log_debug("Unable to flock(%s), skipping event handling: %m", udev_device_get_devnode(d));
err = -EWOULDBLOCK; err = -EWOULDBLOCK;
@ -20,29 +18,24 @@ index 1c9488e..819ea3b 100644
goto skip; goto skip;
} }
} }
@@ -317,8 +318,7 @@ static void worker_new(struct event *event) @@ -318,7 +319,7 @@ static void worker_new(struct event *eve
udev_device_update_db(dev);
} }
- if (fd_lock >= 0) if (fd_lock >= 0)
- close(fd_lock); - close(fd_lock);
+ close_nointr_nofail(fd_lock); + close_nointr_nofail(fd_lock);
/* send processed event back to libudev listeners */ /* send processed event back to libudev listeners */
udev_monitor_send_device(worker_monitor, NULL, dev); udev_monitor_send_device(worker_monitor, NULL, dev);
@@ -377,10 +377,8 @@ skip: @@ -378,9 +379,9 @@ skip:
}
out: out:
udev_device_unref(dev); udev_device_unref(dev);
- if (fd_signal >= 0) if (fd_signal >= 0)
- close(fd_signal); - close(fd_signal);
- if (fd_ep >= 0)
- close(fd_ep);
+ close_nointr_nofail(fd_signal); + close_nointr_nofail(fd_signal);
if (fd_ep >= 0)
- close(fd_ep);
+ close_nointr_nofail(fd_ep); + close_nointr_nofail(fd_ep);
close(fd_inotify); close(fd_inotify);
close(worker_watch[WRITE_END]); close(worker_watch[WRITE_END]);
udev_rules_unref(rules); udev_rules_unref(rules);
--
1.7.9.2