From 91d7592e8a79bcc2e74bbbb5fb9187f5f832f4cb Mon Sep 17 00:00:00 2001 From: "Todd C. Miller" Date: Thu, 29 Dec 2022 15:52:21 -0700 Subject: [PATCH] Use initprogname(), not setprogname() in the fuzzers. This results in better coverage for progname.c. --- lib/iolog/regress/fuzz/fuzz_iolog_json.c | 2 +- lib/iolog/regress/fuzz/fuzz_iolog_legacy.c | 2 +- lib/iolog/regress/fuzz/fuzz_iolog_timing.c | 2 +- lib/util/regress/fuzz/fuzz_sudo_conf.c | 2 +- logsrvd/regress/fuzz/fuzz_logsrvd_conf.c | 2 +- plugins/sudoers/regress/fuzz/fuzz_policy.c | 2 +- plugins/sudoers/regress/fuzz/fuzz_sudoers.c | 2 +- plugins/sudoers/regress/fuzz/fuzz_sudoers_ldif.c | 2 +- 8 files changed, 8 insertions(+), 8 deletions(-) diff --git a/lib/iolog/regress/fuzz/fuzz_iolog_json.c b/lib/iolog/regress/fuzz/fuzz_iolog_json.c index ec1e428b0..80f6c9f66 100644 --- a/lib/iolog/regress/fuzz/fuzz_iolog_json.c +++ b/lib/iolog/regress/fuzz/fuzz_iolog_json.c @@ -96,7 +96,7 @@ LLVMFuzzerTestOneInput(const uint8_t *data, size_t size) struct eventlog *evlog = NULL; FILE *fp; - setprogname("fuzz_iolog_json"); + initprogname("fuzz_iolog_json"); if (getenv("SUDO_FUZZ_VERBOSE") == NULL) sudo_warn_set_conversation(fuzz_conversation); diff --git a/lib/iolog/regress/fuzz/fuzz_iolog_legacy.c b/lib/iolog/regress/fuzz/fuzz_iolog_legacy.c index a52bf56af..207374cc9 100644 --- a/lib/iolog/regress/fuzz/fuzz_iolog_legacy.c +++ b/lib/iolog/regress/fuzz/fuzz_iolog_legacy.c @@ -94,7 +94,7 @@ LLVMFuzzerTestOneInput(const uint8_t *data, size_t size) struct eventlog *evlog = NULL; FILE *fp; - setprogname("fuzz_iolog_legacy"); + initprogname("fuzz_iolog_legacy"); if (getenv("SUDO_FUZZ_VERBOSE") == NULL) sudo_warn_set_conversation(fuzz_conversation); diff --git a/lib/iolog/regress/fuzz/fuzz_iolog_timing.c b/lib/iolog/regress/fuzz/fuzz_iolog_timing.c index cf894973a..dac9736c6 100644 --- a/lib/iolog/regress/fuzz/fuzz_iolog_timing.c +++ b/lib/iolog/regress/fuzz/fuzz_iolog_timing.c @@ -77,7 +77,7 @@ LLVMFuzzerTestOneInput(const uint8_t *data, size_t size) char logdir[] = "/tmp/timing.XXXXXX"; int dfd = -1, fd = -1; - setprogname("fuzz_iolog_timing"); + initprogname("fuzz_iolog_timing"); if (getenv("SUDO_FUZZ_VERBOSE") == NULL) sudo_warn_set_conversation(fuzz_conversation); diff --git a/lib/util/regress/fuzz/fuzz_sudo_conf.c b/lib/util/regress/fuzz/fuzz_sudo_conf.c index 91d786786..4e700868e 100644 --- a/lib/util/regress/fuzz/fuzz_sudo_conf.c +++ b/lib/util/regress/fuzz/fuzz_sudo_conf.c @@ -76,7 +76,7 @@ LLVMFuzzerTestOneInput(const uint8_t *data, size_t size) size_t nwritten; int fd; - setprogname("fuzz_sudo_conf"); + initprogname("fuzz_sudo_conf"); if (getenv("SUDO_FUZZ_VERBOSE") == NULL) sudo_warn_set_conversation(fuzz_conversation); diff --git a/logsrvd/regress/fuzz/fuzz_logsrvd_conf.c b/logsrvd/regress/fuzz/fuzz_logsrvd_conf.c index 1964d443b..39cd66399 100644 --- a/logsrvd/regress/fuzz/fuzz_logsrvd_conf.c +++ b/logsrvd/regress/fuzz/fuzz_logsrvd_conf.c @@ -98,7 +98,7 @@ LLVMFuzzerTestOneInput(const uint8_t *data, size_t size) size_t nwritten; int fd; - setprogname("fuzz_logsrvd_conf"); + initprogname("fuzz_logsrvd_conf"); if (getenv("SUDO_FUZZ_VERBOSE") == NULL) sudo_warn_set_conversation(fuzz_conversation); diff --git a/plugins/sudoers/regress/fuzz/fuzz_policy.c b/plugins/sudoers/regress/fuzz/fuzz_policy.c index e71af3e66..0eff780d0 100644 --- a/plugins/sudoers/regress/fuzz/fuzz_policy.c +++ b/plugins/sudoers/regress/fuzz/fuzz_policy.c @@ -266,7 +266,7 @@ LLVMFuzzerTestOneInput(const uint8_t *data, size_t size) if (fp == NULL) return 0; - setprogname("fuzz_policy"); + initprogname("fuzz_policy"); sudoers_debug_register(getprogname(), NULL); if (getenv("SUDO_FUZZ_VERBOSE") == NULL) sudo_warn_set_conversation(fuzz_conversation); diff --git a/plugins/sudoers/regress/fuzz/fuzz_sudoers.c b/plugins/sudoers/regress/fuzz/fuzz_sudoers.c index 35f910f52..93df61dda 100644 --- a/plugins/sudoers/regress/fuzz/fuzz_sudoers.c +++ b/plugins/sudoers/regress/fuzz/fuzz_sudoers.c @@ -208,7 +208,7 @@ LLVMFuzzerTestOneInput(const uint8_t *data, size_t size) if (fp == NULL) return 0; - setprogname("fuzz_sudoers"); + initprogname("fuzz_sudoers"); sudoers_debug_register(getprogname(), NULL); if (getenv("SUDO_FUZZ_VERBOSE") == NULL) sudo_warn_set_conversation(fuzz_conversation); diff --git a/plugins/sudoers/regress/fuzz/fuzz_sudoers_ldif.c b/plugins/sudoers/regress/fuzz/fuzz_sudoers_ldif.c index 5e0f5a588..f3a28a402 100644 --- a/plugins/sudoers/regress/fuzz/fuzz_sudoers_ldif.c +++ b/plugins/sudoers/regress/fuzz/fuzz_sudoers_ldif.c @@ -132,7 +132,7 @@ LLVMFuzzerTestOneInput(const uint8_t *data, size_t size) if (fp == NULL) return 0; - setprogname("fuzz_sudoers_ldif"); + initprogname("fuzz_sudoers_ldif"); sudoers_debug_register(getprogname(), NULL); if (getenv("SUDO_FUZZ_VERBOSE") == NULL) sudo_warn_set_conversation(fuzz_conversation);