From 024bb0c63e56672d7ff43072bc76b5dbf5192248 Mon Sep 17 00:00:00 2001 From: Yu Watanabe Date: Wed, 19 Mar 2025 01:33:54 +0900 Subject: [PATCH] oomd: do not ignore failure in sd_lisen_fds() Also, use -EBADF for an invalid file descriptor. --- src/oom/oomd.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/oom/oomd.c b/src/oom/oomd.c index 518ddc47c10..53c4948a732 100644 --- a/src/oom/oomd.c +++ b/src/oom/oomd.c @@ -115,10 +115,12 @@ static int run(int argc, char *argv[]) { * requirements do not have a reliable means to check for in code. */ int n = sd_listen_fds(0); + if (n < 0) + return log_error_errno(n, "Failed to determine number of listening fds: %m"); if (n > 1) return log_error_errno(SYNTHETIC_ERRNO(EINVAL), "Received too many file descriptors"); - int fd = n == 1 ? SD_LISTEN_FDS_START : -1; + int fd = n == 1 ? SD_LISTEN_FDS_START : -EBADF; /* SwapTotal is always available in /proc/meminfo and defaults to 0, even on swap-disabled kernels. */ r = get_proc_field("/proc/meminfo", "SwapTotal", WHITESPACE, &swap); -- 2.47.3