AuxXxilium/eudev
1
0
Fork 0
mirror of https://github.com/AuxXxilium/eudev.git synced 2024-12-28 06:35:34 +07:00
Code Issues Actions Packages Projects Releases Wiki Activity

udev: always close lock file descriptor

Browse Source 
https://bugs.freedesktop.org/show_bug.cgi?id=79576

Signed-off-by: Anthony G. Basile <blueness@gentoo.org>
This commit is contained in:
Kay Sievers 2014-06-03 10:46:51 +02:00 committed by Anthony G. Basile
parent 09aadd5a14
commit b493e3e702
3 changed files with 30 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
src/libudev/util.c
View File

@ -154,6 +154,30 @@ void close_nointr_nofail(int fd) {
assert_se(close_nointr(fd) == 0);
}
int safe_close(int fd) {
/*
* Like close_nointr() but cannot fail. Guarantees errno is
* unchanged. Is a NOP with negative fds passed, and returns
* -1, so that it can be used in this syntax:
*
* fd = safe_close(fd);
*/
if (fd >= 0) {
PROTECT_ERRNO;
/* The kernel might return pretty much any error code
* via close(), but the fd will be closed anyway. The
* only condition we want to check for here is whether
* the fd was invalid at all... */
assert_se(close_nointr(fd) != -EBADF);
}
return -1;
}
int unlink_noerrno(const char *path) {
PROTECT_ERRNO;
int r;

2
src/libudev/util.h
View File

@ -124,6 +124,8 @@ static inline const char *startswith(const char *s, const char *prefix) {
char *endswith(const char *s, const char *postfix) _pure_;
int close_nointr(int fd);
int safe_close(int fd);
void close_nointr_nofail(int fd);
int safe_atou(const char *s, unsigned *ret_u);

10
src/udev/udevd.c
View File

@ -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);