diff options
| author | Kay Sievers <kay@vrfy.org> | 2014-06-03 10:46:51 +0200 |
|---|---|---|
| committer | Kay Sievers <kay@vrfy.org> | 2014-06-03 11:06:43 +0200 |
| commit | 3d06f4183470d42361303086ed9dedd29c0ffc1b (patch) | |
| tree | 3d4dee7ab672c84ffbf23971bed9a1e6c0335060 | |
| parent | 63a070415db09f5b5bcc5c487bfc85dabe443dde (diff) | |
udev: always close lock file descriptor
https://bugs.freedesktop.org/show_bug.cgi?id=79576
| -rw-r--r-- | src/udev/udevd.c | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/src/udev/udevd.c b/src/udev/udevd.c index 1c9488e45..819ea3bb2 100644 --- a/src/udev/udevd.c +++ b/src/udev/udevd.c @@ -301,6 +301,7 @@ static void worker_new(struct event *event) 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; + fd_lock = safe_close(fd_lock); goto skip; } } @@ -317,8 +318,7 @@ static void worker_new(struct event *event) udev_device_update_db(dev); } - if (fd_lock >= 0) - close(fd_lock); + safe_close(fd_lock); /* send processed event back to libudev listeners */ udev_monitor_send_device(worker_monitor, NULL, dev); @@ -377,10 +377,8 @@ skip: } out: udev_device_unref(dev); - if (fd_signal >= 0) - close(fd_signal); - if (fd_ep >= 0) - close(fd_ep); + safe_close(fd_signal); + safe_close(fd_ep); close(fd_inotify); close(worker_watch[WRITE_END]); udev_rules_unref(rules); |