dirkmueller/systemd
SHA256
1
0
Fork 0
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=654
This commit is contained in:
Dr. Werner Fink 2014-06-03 15:17:17 +00:00 committed by Git OBS Bridge
parent d30ae19054
commit dca04a66ab
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,4 +1,4 @@
From 3d06f4183470d42361303086ed9dedd29c0ffc1b Mon Sep 17 00:00:00 2001 Based on 3d06f4183470d42361303086ed9dedd29c0ffc1b Mon Sep 17 00:00:00 2001
From: Kay Sievers <kay@vrfy.org> From: Kay Sievers <kay@vrfy.org>
Date: Tue, 3 Jun 2014 10:46:51 +0200 Date: Tue, 3 Jun 2014 10:46:51 +0200
Subject: [PATCH] udev: always close lock file descriptor Subject: [PATCH] udev: always close lock file descriptor
@ -16,7 +16,7 @@ index 1c9488e..819ea3b 100644
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;
+ fd_lock = safe_close(fd_lock); + close_nointr_nofail(fd_lock); fd_lock = -1;
goto skip; goto skip;
} }
} }
@ -26,7 +26,7 @@ index 1c9488e..819ea3b 100644
- if (fd_lock >= 0) - if (fd_lock >= 0)
- close(fd_lock); - close(fd_lock);
+ safe_close(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);
@ -38,8 +38,8 @@ index 1c9488e..819ea3b 100644
- close(fd_signal); - close(fd_signal);
- if (fd_ep >= 0) - if (fd_ep >= 0)
- close(fd_ep); - close(fd_ep);
+ safe_close(fd_signal); + close_nointr_nofail(fd_signal);
+ safe_close(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);