From bcd9302508e5b89cfdcf2a2acebdf05d88d7479e Mon Sep 17 00:00:00 2001 From: Rich Felker Date: Sun, 7 Apr 2013 23:19:00 -0400 Subject: [PATCH] fix signalfd not to ignore flags also include fallback code for broken kernels that don't support the flags. as usual, the fallback has a race condition that can leak file descriptors. --- src/linux/signalfd.c | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/src/linux/signalfd.c b/src/linux/signalfd.c index 94de3627..da6bcedb 100644 --- a/src/linux/signalfd.c +++ b/src/linux/signalfd.c @@ -1,8 +1,19 @@ #include #include +#include +#include #include "syscall.h" int signalfd(int fd, const sigset_t *sigs, int flags) { - return syscall(SYS_signalfd, fd, sigs, _NSIG/8); + int ret = __syscall(SYS_signalfd4, fd, sigs, _NSIG/8, flags); + if (ret != -ENOSYS) return __syscall_ret(ret); + ret = __syscall(SYS_signalfd, fd, sigs, _NSIG/8); + if (ret >= 0) { + if (flags & SFD_CLOEXEC) + __syscall(SYS_fcntl, ret, F_SETFD, FD_CLOEXEC); + if (flags & SFD_NONBLOCK) + __syscall(SYS_fcntl, ret, F_SETFL, O_NONBLOCK); + } + return __syscall_ret(ret); } -- 2.20.1