diff options
author | Lennart Poettering <lennart@poettering.net> | 2020-06-09 13:40:25 +0200 |
---|---|---|
committer | Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> | 2020-06-10 08:57:31 +0200 |
commit | dad28bffd67692d6c22e0de98ddb0d217c034ec5 (patch) | |
tree | 29b5ec4a723341c4a38636d8be4566dba5a38ec0 /src/libsystemd/sd-daemon | |
parent | 45204921be610be839482a037985fd5a5052f2dd (diff) | |
download | systemd-dad28bffd67692d6c22e0de98ddb0d217c034ec5.tar.gz |
tree-wide: check POLLNVAL everywhere
poll() sets POLLNVAL inside of the poll structures if an invalid fd is
passed. So far we generally didn't check for that, thus not taking
notice of the error. Given that this specific kind of error is generally
indication of a programming error, and given that our code is embedded
into our projects via NSS or because people link against our library,
let's explicitly check for this and convert it to EBADF.
(I ran into a busy loop because of this missing check when some of my
test code accidentally closed an fd it shouldn't close, so this is a
real thing)
Diffstat (limited to 'src/libsystemd/sd-daemon')
-rw-r--r-- | src/libsystemd/sd-daemon/sd-daemon.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/libsystemd/sd-daemon/sd-daemon.c b/src/libsystemd/sd-daemon/sd-daemon.c index 587a1f2595..0bc0fc16ae 100644 --- a/src/libsystemd/sd-daemon/sd-daemon.c +++ b/src/libsystemd/sd-daemon/sd-daemon.c @@ -577,6 +577,8 @@ _public_ int sd_notify_barrier(int unset_environment, uint64_t timeout) { return -errno; if (r == 0) return -ETIMEDOUT; + if (pfd.revents & POLLNVAL) + return -EBADF; return 1; } |