From de6055cf6a1efef65fa287575a9c74c183b00cdd Mon Sep 17 00:00:00 2001 From: Yu Watanabe Date: Thu, 17 Sep 2026 07:50:57 +0900 Subject: [PATCH] fuzz: fix error handling of fcntl() (cherry picked from commit 76f37fd835028177df93d674d9a2f897893af69c) --- src/fuzz/fuzz-bootspec.c | 2 +- src/systemctl/fuzz-systemctl-parse-argv.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/fuzz/fuzz-bootspec.c b/src/fuzz/fuzz-bootspec.c index e3adb394f7..ad29360354 100644 --- a/src/fuzz/fuzz-bootspec.c +++ b/src/fuzz/fuzz-bootspec.c @@ -112,7 +112,7 @@ int LLVMFuzzerTestOneInput(const uint8_t *data, size_t size) { if (getenv_bool("SYSTEMD_FUZZ_OUTPUT") <= 0) { orig_stdout_fd = fcntl(fileno(stdout), F_DUPFD_CLOEXEC, 3); if (orig_stdout_fd < 0) - log_warning_errno(orig_stdout_fd, "Failed to duplicate fd 1: %m"); + log_warning_errno(errno, "Failed to duplicate fd 1, ignoring: %m"); else assert_se(freopen("/dev/null", "w", stdout)); } diff --git a/src/systemctl/fuzz-systemctl-parse-argv.c b/src/systemctl/fuzz-systemctl-parse-argv.c index 9d487f7c6e..fe9d7f1a99 100644 --- a/src/systemctl/fuzz-systemctl-parse-argv.c +++ b/src/systemctl/fuzz-systemctl-parse-argv.c @@ -84,7 +84,7 @@ int LLVMFuzzerTestOneInput(const uint8_t *data, size_t size) { if (getenv_bool("SYSTEMD_FUZZ_OUTPUT") <= 0) { orig_stdout_fd = fcntl(fileno(stdout), F_DUPFD_CLOEXEC, 3); if (orig_stdout_fd < 0) - log_warning_errno(orig_stdout_fd, "Failed to duplicate fd 1: %m"); + log_warning_errno(errno, "Failed to duplicate fd 1, ignoring: %m"); else assert_se(freopen("/dev/null", "w", stdout)); }