fuzz: unify logging setup

Make sure we don't log anything when running in "fuzzing" mode. Also,
when at it, unify the setup logic into a helper, pretty similar to
the test_setup_logging() one.

Addresses:
  - https://github.com/systemd/systemd/pull/29558#pullrequestreview-1676060607
  - https://github.com/systemd/systemd/pull/29558#discussion_r1358940663

diff --git a/src/core/fuzz-execute-serialize.c b/src/core/fuzz-execute-serialize.c
index 140b2b8250f676ae2b5d56ec9828697fd88357f1..a62a135fdfe78a55983f70a06d59584e21c17f17 100644 (file)
--- a/src/core/fuzz-execute-serialize.c
+++ b/src/core/fuzz-execute-serialize.c
@@ -82,12 +82,7 @@ int LLVMFuzzerTestOneInput(const uint8_t *data, size_t size) {
         _cleanup_fclose_ FILE *f = NULL;
         _cleanup_fdset_free_ FDSet *fdset = NULL;
 
-        /* We don't want to fill the logs with messages about parse errors.
-         * Disable most logging if not running standalone. */
-        if (!getenv("SYSTEMD_LOG_LEVEL")) {
-                log_set_max_level(LOG_CRIT);
-                log_set_target(LOG_TARGET_NULL);
-        }
+        fuzz_setup_logging();
 
         assert_se(fdset = fdset_new());
         assert_se(f = data_to_file(data, size));

diff --git a/src/core/fuzz-manager-serialize.c b/src/core/fuzz-manager-serialize.c
index 0e4bfa4484918b918e2c417a4f50256071087d66..57083ca25f00c7aa32796264aaf155753377a71f 100644 (file)
--- a/src/core/fuzz-manager-serialize.c
+++ b/src/core/fuzz-manager-serialize.c
@@ -17,12 +17,7 @@ int LLVMFuzzerTestOneInput(const uint8_t *data, size_t size) {
         if (outside_size_range(size, 0, 65536))
                 return 0;
 
-        /* We don't want to fill the logs with messages about parse errors.
-         * Disable most logging if not running standalone. */
-        if (!getenv("SYSTEMD_LOG_LEVEL")) {
-                log_set_max_level(LOG_CRIT);
-                log_set_target(LOG_TARGET_NULL);
-        }
+        fuzz_setup_logging();
 
         assert_se(manager_new(RUNTIME_SCOPE_SYSTEM, MANAGER_TEST_RUN_MINIMAL|MANAGER_TEST_DONT_OPEN_EXECUTOR, &m) >= 0);
         /* Set log overrides as well to make it harder for a serialization file

diff --git a/src/core/fuzz-unit-file.c b/src/core/fuzz-unit-file.c
index 7b738062b509d83edbdf7e193fd515d77308d176..57480cf76632b69ce8038579b205f1e2af7d613c 100644 (file)
--- a/src/core/fuzz-unit-file.c
+++ b/src/core/fuzz-unit-file.c
@@ -60,10 +60,7 @@ int LLVMFuzzerTestOneInput(const uint8_t *data, size_t size) {
 
         assert_se(fseek(f, offset, SEEK_SET) == 0);
 
-        /* We don't want to fill the logs with messages about parse errors.
-         * Disable most logging if not running standalone */
-        if (!getenv("SYSTEMD_LOG_LEVEL"))
-                log_set_max_level(LOG_CRIT);
+        fuzz_setup_logging();
 
         assert_se(manager_new(RUNTIME_SCOPE_SYSTEM, MANAGER_TEST_RUN_MINIMAL|MANAGER_TEST_DONT_OPEN_EXECUTOR, &m) >= 0);
 

diff --git a/src/fuzz/fuzz-bootspec.c b/src/fuzz/fuzz-bootspec.c
index cea674c4c8ba2c0fe6af72ae754b25e8fdf3d3d0..7a8578776457487b777e4b4f4de6062cea152fa6 100644 (file)
--- a/src/fuzz/fuzz-bootspec.c
+++ b/src/fuzz/fuzz-bootspec.c
@@ -87,9 +87,7 @@ int LLVMFuzzerTestOneInput(const uint8_t *data, size_t size) {
         if (outside_size_range(size, 0, 65536))
                 return 0;
 
-        /* Disable most logging if not running standalone */
-        if (!getenv("SYSTEMD_LOG_LEVEL"))
-                log_set_max_level(LOG_CRIT);
+        fuzz_setup_logging();
 
         assert_se(datadup = memdup_suffix0(data, size));
 

diff --git a/src/fuzz/fuzz-bus-label.c b/src/fuzz/fuzz-bus-label.c
index 93bac9adf4957fcb9695ce5838acf8c165cea7a1..c7be82a767720c2f48d04d2fe0c77feb92e5672a 100644 (file)
--- a/src/fuzz/fuzz-bus-label.c
+++ b/src/fuzz/fuzz-bus-label.c
@@ -9,6 +9,8 @@
 int LLVMFuzzerTestOneInput(const uint8_t *data, size_t size) {
         _cleanup_free_ char *unescaped = NULL, *escaped = NULL;
 
+        fuzz_setup_logging();
+
         unescaped = bus_label_unescape_n((const char*)data, size);
         assert_se(unescaped != NULL);
         escaped = bus_label_escape(unescaped);

diff --git a/src/fuzz/fuzz-calendarspec.c b/src/fuzz/fuzz-calendarspec.c
index 573a48a48b47e79b25b725919d70d1955069a430..b31a3f2b1728ed2de0df17086b646f61567c3e66 100644 (file)
--- a/src/fuzz/fuzz-calendarspec.c
+++ b/src/fuzz/fuzz-calendarspec.c
@@ -12,8 +12,7 @@ int LLVMFuzzerTestOneInput(const uint8_t *data, size_t size) {
         _cleanup_free_ char *str = NULL;
         int r;
 
-        if (!getenv("SYSTEMD_LOG_LEVEL"))
-                log_set_max_level(LOG_CRIT);
+        fuzz_setup_logging();
 
         assert_se(str = memdup_suffix0(data, size));
 

diff --git a/src/fuzz/fuzz-catalog.c b/src/fuzz/fuzz-catalog.c
index f3029f49d04bf23d9600bdcbb7a90b5171b21527..f9561f24c4e03f5c3b11341bd334090f25e01caa 100644 (file)
--- a/src/fuzz/fuzz-catalog.c
+++ b/src/fuzz/fuzz-catalog.c
@@ -11,8 +11,7 @@ int LLVMFuzzerTestOneInput(const uint8_t *data, size_t size) {
         _cleanup_close_ int fd = -EBADF;
         _cleanup_ordered_hashmap_free_free_free_ OrderedHashmap *h = NULL;
 
-        if (!getenv("SYSTEMD_LOG_LEVEL"))
-                log_set_max_level(LOG_CRIT);
+        fuzz_setup_logging();
 
         assert_se(h = ordered_hashmap_new(&catalog_hash_ops));
 

diff --git a/src/fuzz/fuzz-compress.c b/src/fuzz/fuzz-compress.c
index 9cd571dfb896d177797a72fe046dbea9e5c2f003..c3f68f62dd27b27e34263fe00ab1201961ebe7fa 100644 (file)
--- a/src/fuzz/fuzz-compress.c
+++ b/src/fuzz/fuzz-compress.c
@@ -29,10 +29,7 @@ int LLVMFuzzerTestOneInput(const uint8_t *data, size_t size) {
 
         int alg = h->alg;
 
-        /* We don't want to fill the logs with messages about parse errors.
-         * Disable most logging if not running standalone */
-        if (!getenv("SYSTEMD_LOG_LEVEL"))
-                log_set_max_level(LOG_CRIT);
+        fuzz_setup_logging();
 
         log_info("Using compression %s, data size=%zu",
                  compression_to_string(alg),

diff --git a/src/fuzz/fuzz-env-file.c b/src/fuzz/fuzz-env-file.c
index 6217361b2e759b241909fafe9b857a6c5c1771e9..ff7e529ac351078be3819c7da8984da0099482bc 100644 (file)
--- a/src/fuzz/fuzz-env-file.c
+++ b/src/fuzz/fuzz-env-file.c
@@ -18,10 +18,7 @@ int LLVMFuzzerTestOneInput(const uint8_t *data, size_t size) {
         f = data_to_file(data, size);
         assert_se(f);
 
-        /* We don't want to fill the logs with messages about parse errors.
-         * Disable most logging if not running standalone */
-        if (!getenv("SYSTEMD_LOG_LEVEL"))
-                log_set_max_level(LOG_CRIT);
+        fuzz_setup_logging();
 
         (void) load_env_file(f, NULL, &rl);
         assert_se(fseek(f, 0, SEEK_SET) == 0);

diff --git a/src/fuzz/fuzz-hostname-setup.c b/src/fuzz/fuzz-hostname-setup.c
index d7c23eef12a8eea4e88191976aa590550f2b7c8f..4895631b67bcc268a3ef9fe3b1de146e44d53e6e 100644 (file)
--- a/src/fuzz/fuzz-hostname-setup.c
+++ b/src/fuzz/fuzz-hostname-setup.c
@@ -12,10 +12,7 @@ int LLVMFuzzerTestOneInput(const uint8_t *data, size_t size) {
         f = data_to_file(data, size);
         assert_se(f);
 
-        /* We don't want to fill the logs with messages about parse errors.
-         * Disable most logging if not running standalone */
-        if (!getenv("SYSTEMD_LOG_LEVEL"))
-                log_set_max_level(LOG_CRIT);
+        fuzz_setup_logging();
 
         (void) read_etc_hostname_stream(f, &ret);
 

diff --git a/src/fuzz/fuzz-json.c b/src/fuzz/fuzz-json.c
index c83ec833281a60b28ee2a8e7b81f777182667577..3d6d689f28c64e2075a3a480275c57318e490e56 100644 (file)
--- a/src/fuzz/fuzz-json.c
+++ b/src/fuzz/fuzz-json.c
@@ -14,9 +14,7 @@ int LLVMFuzzerTestOneInput(const uint8_t *data, size_t size) {
         FILE *g = NULL;
         int r;
 
-        /* Disable most logging if not running standalone */
-        if (!getenv("SYSTEMD_LOG_LEVEL"))
-                log_set_max_level(LOG_CRIT);
+        fuzz_setup_logging();
 
         f = data_to_file(data, size);
         assert_se(f);

diff --git a/src/fuzz/fuzz-time-util.c b/src/fuzz/fuzz-time-util.c
index 8e6cb8553b8d2edc7525c229997ea4d74f12b7e8..5be2e4f1ddeafa77be3fb9158227a2fdf50e3aa5 100644 (file)
--- a/src/fuzz/fuzz-time-util.c
+++ b/src/fuzz/fuzz-time-util.c
@@ -9,8 +9,7 @@ int LLVMFuzzerTestOneInput(const uint8_t *data, size_t size) {
         _cleanup_free_ char *str = NULL;
         usec_t usec;
 
-        if (!getenv("SYSTEMD_LOG_LEVEL"))
-                log_set_max_level(LOG_CRIT);
+        fuzz_setup_logging();
 
         assert_se(str = memdup_suffix0(data, size));
 

diff --git a/src/fuzz/fuzz-udev-database.c b/src/fuzz/fuzz-udev-database.c
index 2a48c14961f64565d4f72d42936a817dc11b5546..6b4fc8270d9bbd0e833fabbf039908a61b9c23fb 100644 (file)
--- a/src/fuzz/fuzz-udev-database.c
+++ b/src/fuzz/fuzz-udev-database.c
@@ -12,8 +12,7 @@ int LLVMFuzzerTestOneInput(const uint8_t *data, size_t size) {
         _cleanup_(unlink_tempfilep) char filename[] = "/tmp/fuzz-udev-database.XXXXXX";
         _cleanup_fclose_ FILE *f = NULL;
 
-        if (!getenv("SYSTEMD_LOG_LEVEL"))
-                log_set_max_level(LOG_CRIT);
+        fuzz_setup_logging();
 
         assert_se(fmkostemp_safe(filename, "r+", &f) == 0);
         if (size != 0)

diff --git a/src/fuzz/fuzz-varlink-idl.c b/src/fuzz/fuzz-varlink-idl.c
index cefc49219cf40a4ab53e5f882274df42442443a8..7ad0f28413e9ad305b86e4020dedecf92468a21f 100644 (file)
--- a/src/fuzz/fuzz-varlink-idl.c
+++ b/src/fuzz/fuzz-varlink-idl.c
@@ -14,9 +14,7 @@ int LLVMFuzzerTestOneInput(const uint8_t *data, size_t size) {
         _cleanup_free_ char *str = NULL, *dump = NULL;
         int r;
 
-        log_set_max_level(LOG_CRIT);
-        log_parse_environment();
-        (void) log_open();
+        fuzz_setup_logging();
 
         assert_se(str = memdup_suffix0(data, size));
 

diff --git a/src/fuzz/fuzz-varlink.c b/src/fuzz/fuzz-varlink.c
index cbfde088d90ba7c9bb958b5f9f0da1fafc31ee54..3407760fbf096e518fb8c0176935e48e35945ad3 100644 (file)
--- a/src/fuzz/fuzz-varlink.c
+++ b/src/fuzz/fuzz-varlink.c
@@ -92,8 +92,7 @@ int LLVMFuzzerTestOneInput(const uint8_t *data, size_t size) {
         _cleanup_(varlink_flush_close_unrefp) Varlink *c = NULL;
         _cleanup_(sd_event_unrefp) sd_event *e = NULL;
 
-        log_set_max_level(LOG_CRIT);
-        log_parse_environment();
+        fuzz_setup_logging();
 
         assert_se(null = fopen("/dev/null", "we"));
 

diff --git a/src/fuzz/fuzz.h b/src/fuzz/fuzz.h
index 77e0ad98dc3e919d0f736feb7831682c5deecca9..698ba42d2f4ebf0a66e154bc0316e80e07d85db1 100644 (file)
--- a/src/fuzz/fuzz.h
+++ b/src/fuzz/fuzz.h
@@ -28,5 +28,13 @@ static inline bool outside_size_range(size_t size, size_t lower, size_t upper) {
         return false;
 }
 
+static inline void fuzz_setup_logging(void) {
+        /* We don't want to fill the logs and slow down stuff when running
+         * in a fuzzing mode, so disable most of the logging. */
+        log_set_max_level(LOG_CRIT);
+        log_parse_environment();
+        log_open();
+}
+
 /* Force value to not be optimized away. */
 #define DO_NOT_OPTIMIZE(value) ({ asm volatile("" : : "g"(value) : "memory"); })

diff --git a/src/journal-remote/fuzz-journal-remote.c b/src/journal-remote/fuzz-journal-remote.c
index ab4e731000cb079e7fd4f850646fb8f4a4dc9860..557100bb965d55f7670bfcbc68175685bc6e4336 100644 (file)
--- a/src/journal-remote/fuzz-journal-remote.c
+++ b/src/journal-remote/fuzz-journal-remote.c
@@ -30,8 +30,7 @@ int LLVMFuzzerTestOneInput(const uint8_t *data, size_t size) {
         if (outside_size_range(size, 3, 65536))
                 return 0;
 
-        if (!getenv("SYSTEMD_LOG_LEVEL"))
-                log_set_max_level(LOG_ERR);
+        fuzz_setup_logging();
 
         assert_se(mkdtemp_malloc("/tmp/fuzz-journal-remote-XXXXXX", &tmp) >= 0);
         assert_se(name = path_join(tmp, "fuzz-journal-remote.XXXXXX.journal"));

diff --git a/src/journal/fuzz-journald-audit.c b/src/journal/fuzz-journald-audit.c
index 6e8e18048ecf649255338bdccb20de642dba3f20..9bf7d01e5785a13cd888fe103dce0e584a70e9af 100644 (file)
--- a/src/journal/fuzz-journald-audit.c
+++ b/src/journal/fuzz-journald-audit.c
@@ -7,6 +7,8 @@
 int LLVMFuzzerTestOneInput(const uint8_t *data, size_t size) {
         Server s;
 
+        fuzz_setup_logging();
+
         dummy_server_init(&s, data, size);
         process_audit_string(&s, 0, s.buffer, size);
         server_done(&s);

diff --git a/src/journal/fuzz-journald-kmsg.c b/src/journal/fuzz-journald-kmsg.c
index ec22f14ccb1ab76387aa3e300cc4506db8c62ec3..104a9b3a7d875aad007591fc03985ac12f62ab5f 100644 (file)
--- a/src/journal/fuzz-journald-kmsg.c
+++ b/src/journal/fuzz-journald-kmsg.c
@@ -10,10 +10,7 @@ int LLVMFuzzerTestOneInput(const uint8_t *data, size_t size) {
         if (size == 0)
                 return 0;
 
-        /* We don't want to fill the logs with assert warnings.
-         * Disable most logging if not running standalone */
-        if (!getenv("SYSTEMD_LOG_LEVEL"))
-                log_set_max_level(LOG_CRIT);
+        fuzz_setup_logging();
 
         dummy_server_init(&s, data, size);
         dev_kmsg_record(&s, s.buffer, size);

diff --git a/src/journal/fuzz-journald-native-fd.c b/src/journal/fuzz-journald-native-fd.c
index edbf834478dcd7eb92e5e1658dcdba53d5db6e21..110eb7f5bf239966b5ba5668f8d57b5fea9d9a05 100644 (file)
--- a/src/journal/fuzz-journald-native-fd.c
+++ b/src/journal/fuzz-journald-native-fd.c
@@ -18,8 +18,7 @@ int LLVMFuzzerTestOneInput(const uint8_t *data, size_t size) {
         struct ucred ucred;
         struct timeval *tv = NULL;
 
-        if (!getenv("SYSTEMD_LOG_LEVEL"))
-                log_set_max_level(LOG_CRIT);
+        fuzz_setup_logging();
 
         dummy_server_init(&s, NULL, 0);
 

diff --git a/src/journal/fuzz-journald-native.c b/src/journal/fuzz-journald-native.c
index 6531c4f6686f406c310a25c30e8b6dd75de53a60..6738d26e97f86fc796142d1ea057bcf23faa9aa7 100644 (file)
--- a/src/journal/fuzz-journald-native.c
+++ b/src/journal/fuzz-journald-native.c
@@ -5,6 +5,8 @@
 #include "journald-native.h"
 
 int LLVMFuzzerTestOneInput(const uint8_t *data, size_t size) {
+        fuzz_setup_logging();
+
         fuzz_journald_processing_function(data, size, server_process_native_message);
         return 0;
 }

diff --git a/src/journal/fuzz-journald-stream.c b/src/journal/fuzz-journald-stream.c
index ed52f950d2e122db00ceeff8b9f7be83b951a581..d4032cdc513966a217c35bac10e05df960ff452f 100644 (file)
--- a/src/journal/fuzz-journald-stream.c
+++ b/src/journal/fuzz-journald-stream.c
@@ -19,8 +19,7 @@ int LLVMFuzzerTestOneInput(const uint8_t *data, size_t size) {
         if (outside_size_range(size, 1, 65536))
                 return 0;
 
-        if (!getenv("SYSTEMD_LOG_LEVEL"))
-                log_set_max_level(LOG_CRIT);
+        fuzz_setup_logging();
 
         assert_se(socketpair(AF_UNIX, SOCK_STREAM|SOCK_CLOEXEC|SOCK_NONBLOCK, 0, stream_fds) >= 0);
         dummy_server_init(&s, NULL, 0);

diff --git a/src/journal/fuzz-journald-syslog.c b/src/journal/fuzz-journald-syslog.c
index 72ec610fbfc29bf9d033740b493f87816775c515..b3e2d3c09cbb75469bae20610e2ba952abffab2c 100644 (file)
--- a/src/journal/fuzz-journald-syslog.c
+++ b/src/journal/fuzz-journald-syslog.c
@@ -5,6 +5,8 @@
 #include "journald-syslog.h"
 
 int LLVMFuzzerTestOneInput(const uint8_t *data, size_t size) {
+        fuzz_setup_logging();
+
         fuzz_journald_processing_function(data, size, server_process_syslog_message);
         return 0;
 }

diff --git a/src/libsystemd-network/fuzz-dhcp-client.c b/src/libsystemd-network/fuzz-dhcp-client.c
index bdd8a483a15f47b986aa62e68b2a7ec235d4fa96..91e2ff7a51d41fb25efd2e6b14912f2508b74373 100644 (file)
--- a/src/libsystemd-network/fuzz-dhcp-client.c
+++ b/src/libsystemd-network/fuzz-dhcp-client.c
@@ -56,8 +56,7 @@ int LLVMFuzzerTestOneInput(const uint8_t *data, size_t size) {
 
         assert_se(setenv("SYSTEMD_NETWORK_TEST_MODE", "1", 1) >= 0);
 
-        if (!getenv("SYSTEMD_LOG_LEVEL"))
-                log_set_max_level(LOG_CRIT);
+        fuzz_setup_logging();
 
         r = sd_dhcp_client_new(&client, false);
         assert_se(r >= 0);

diff --git a/src/libsystemd-network/fuzz-dhcp-server-relay.c b/src/libsystemd-network/fuzz-dhcp-server-relay.c
index a53e1c25372b9f199ba935ad2f357c68c08675cb..3241d7c8daba1db73f7d98d2503e92a95ffcd9bf 100644 (file)
--- a/src/libsystemd-network/fuzz-dhcp-server-relay.c
+++ b/src/libsystemd-network/fuzz-dhcp-server-relay.c
@@ -25,6 +25,8 @@ int LLVMFuzzerTestOneInput(const uint8_t *data, size_t size) {
         if (size < sizeof(DHCPMessage))
                 return 0;
 
+        fuzz_setup_logging();
+
         assert_se(sd_dhcp_server_new(&server, 1) >= 0);
         assert_se(sd_dhcp_server_attach_event(server, NULL, 0) >= 0);
         assert_se(sd_dhcp_server_configure_pool(server, &address, 24, 0, 0) >= 0);

diff --git a/src/libsystemd-network/fuzz-dhcp-server.c b/src/libsystemd-network/fuzz-dhcp-server.c
index 192e209a2ff0002854e274f927938e6a239cb7b4..a294324cdee58b6a6c0391922728f43c019cdece 100644 (file)
--- a/src/libsystemd-network/fuzz-dhcp-server.c
+++ b/src/libsystemd-network/fuzz-dhcp-server.c
@@ -78,6 +78,8 @@ int LLVMFuzzerTestOneInput(const uint8_t *data, size_t size) {
         if (size < sizeof(DHCPMessage))
                 return 0;
 
+        fuzz_setup_logging();
+
         assert_se(duped = memdup(data, size));
 
         assert_se(sd_dhcp_server_new(&server, 1) >= 0);

diff --git a/src/libsystemd-network/fuzz-dhcp6-client.c b/src/libsystemd-network/fuzz-dhcp6-client.c
index 204c0e15d23d61d73957d298360962d27031d02d..b879e1b46915a7c4ddec837fe4c66249eef0af25 100644 (file)
--- a/src/libsystemd-network/fuzz-dhcp6-client.c
+++ b/src/libsystemd-network/fuzz-dhcp6-client.c
@@ -75,8 +75,7 @@ int LLVMFuzzerTestOneInput(const uint8_t *data, size_t size) {
 
         assert_se(setenv("SYSTEMD_NETWORK_TEST_MODE", "1", 1) >= 0);
 
-        if (!getenv("SYSTEMD_LOG_LEVEL"))
-                log_set_max_level(LOG_CRIT);
+        fuzz_setup_logging();
 
         if (outside_size_range(size, 0, 65536))
                 return 0;

diff --git a/src/libsystemd-network/fuzz-lldp-rx.c b/src/libsystemd-network/fuzz-lldp-rx.c
index 2d8e201854024879c76ccd600caf606de3929219..64f96ae2cbcf81b5ac6f46df4e61902d6e78a1b8 100644 (file)
--- a/src/libsystemd-network/fuzz-lldp-rx.c
+++ b/src/libsystemd-network/fuzz-lldp-rx.c
@@ -26,6 +26,8 @@ int LLVMFuzzerTestOneInput(const uint8_t *data, size_t size) {
         if (outside_size_range(size, 0, 2048))
                 return 0;
 
+        fuzz_setup_logging();
+
         assert_se(sd_event_new(&e) == 0);
         assert_se(sd_lldp_rx_new(&lldp_rx) >= 0);
         assert_se(sd_lldp_rx_set_ifindex(lldp_rx, 42) >= 0);

diff --git a/src/libsystemd-network/fuzz-ndisc-rs.c b/src/libsystemd-network/fuzz-ndisc-rs.c
index 54dbfc1c76f8c9deb281431cca47e505efd922ce..a89e2b0ed7c874ee169cd1490d5af9c6b43b83bb 100644 (file)
--- a/src/libsystemd-network/fuzz-ndisc-rs.c
+++ b/src/libsystemd-network/fuzz-ndisc-rs.c
@@ -23,6 +23,8 @@ int LLVMFuzzerTestOneInput(const uint8_t *data, size_t size) {
         if (outside_size_range(size, 0, 2048))
                 return 0;
 
+        fuzz_setup_logging();
+
         assert_se(sd_event_new(&e) >= 0);
         assert_se(sd_ndisc_new(&nd) >= 0);
         assert_se(sd_ndisc_attach_event(nd, e, 0) >= 0);

diff --git a/src/libsystemd/sd-bus/fuzz-bus-match.c b/src/libsystemd/sd-bus/fuzz-bus-match.c
index f7f12746e5c75a8d734b78bb46ccbfc5934a1f3d..16da534245eddef33079135ac47e7f1f035db39f 100644 (file)
--- a/src/libsystemd/sd-bus/fuzz-bus-match.c
+++ b/src/libsystemd/sd-bus/fuzz-bus-match.c
@@ -18,10 +18,7 @@ int LLVMFuzzerTestOneInput(const uint8_t *data, size_t size) {
         if (outside_size_range(size, 0, 65536))
                 return 0;
 
-        /* We don't want to fill the logs with messages about parse errors.
-         * Disable most logging if not running standalone */
-        if (!getenv("SYSTEMD_LOG_LEVEL"))
-                log_set_max_level(LOG_CRIT);
+        fuzz_setup_logging();
 
         r = sd_bus_new(&bus);
         assert_se(r >= 0);

diff --git a/src/libsystemd/sd-bus/fuzz-bus-message.c b/src/libsystemd/sd-bus/fuzz-bus-message.c
index 9b04b4422b134e5903a5d24e470d8c752fbc92de..ca7091eff27a2ca2bfbd54c4afe84cc375a16e18 100644 (file)
--- a/src/libsystemd/sd-bus/fuzz-bus-message.c
+++ b/src/libsystemd/sd-bus/fuzz-bus-message.c
@@ -17,10 +17,7 @@ int LLVMFuzzerTestOneInput(const uint8_t *data, size_t size) {
         FILE *g = NULL;
         int r;
 
-        /* We don't want to fill the logs with messages about parse errors.
-         * Disable most logging if not running standalone */
-        if (!getenv("SYSTEMD_LOG_LEVEL"))
-                log_set_max_level(LOG_CRIT);
+        fuzz_setup_logging();
 
         r = sd_bus_new(&bus);
         assert_se(r >= 0);

diff --git a/src/network/fuzz-netdev-parser.c b/src/network/fuzz-netdev-parser.c
index 77e87e9c433699fa7a052b6088650f81a5e06eb3..f0988bd4cc5cd685d366fbe82ae5b0bd1725762d 100644 (file)
--- a/src/network/fuzz-netdev-parser.c
+++ b/src/network/fuzz-netdev-parser.c
@@ -14,8 +14,7 @@ int LLVMFuzzerTestOneInput(const uint8_t *data, size_t size) {
         if (outside_size_range(size, 0, 65536))
                 return 0;
 
-        if (!getenv("SYSTEMD_LOG_LEVEL"))
-                log_set_max_level(LOG_CRIT);
+        fuzz_setup_logging();
 
         assert_se(fmkostemp_safe(netdev_config, "r+", &f) == 0);
         if (size != 0)

diff --git a/src/network/fuzz-network-parser.c b/src/network/fuzz-network-parser.c
index 0c9d6d2110d1deb9772c42779727ef4caf6fdad3..eb17f09ca0959557694ef3607d89f45380f048d6 100644 (file)
--- a/src/network/fuzz-network-parser.c
+++ b/src/network/fuzz-network-parser.c
@@ -14,8 +14,7 @@ int LLVMFuzzerTestOneInput(const uint8_t *data, size_t size) {
         if (outside_size_range(size, 0, 65536))
                 return 0;
 
-        if (!getenv("SYSTEMD_LOG_LEVEL"))
-                log_set_max_level(LOG_CRIT);
+        fuzz_setup_logging();
 
         assert_se(fmkostemp_safe(network_config, "r+", &f) == 0);
         if (size != 0)

diff --git a/src/nspawn/fuzz-nspawn-oci.c b/src/nspawn/fuzz-nspawn-oci.c
index 5d0383479b200a8f89fccedc4af90a51b0630249..daa478e83ccffe8ade350ff190595d0734b574bf 100644 (file)
--- a/src/nspawn/fuzz-nspawn-oci.c
+++ b/src/nspawn/fuzz-nspawn-oci.c
@@ -15,10 +15,7 @@ int LLVMFuzzerTestOneInput(const uint8_t *data, size_t size) {
         f = data_to_file(data, size);
         assert_se(f);
 
-        /* We don't want to fill the logs with messages about parse errors.
-         * Disable most logging if not running standalone */
-        if (!getenv("SYSTEMD_LOG_LEVEL"))
-                log_set_max_level(LOG_CRIT);
+        fuzz_setup_logging();
 
         (void) oci_load(f, "/dev/null", &s);
 

diff --git a/src/nspawn/fuzz-nspawn-settings.c b/src/nspawn/fuzz-nspawn-settings.c
index 40ee78438d2f15494a187031df9454ef0cf53fdc..e45bfd8fdd8b088611156112668f1fe8536602cd 100644 (file)
--- a/src/nspawn/fuzz-nspawn-settings.c
+++ b/src/nspawn/fuzz-nspawn-settings.c
@@ -15,10 +15,7 @@ int LLVMFuzzerTestOneInput(const uint8_t *data, size_t size) {
         f = data_to_file(data, size);
         assert_se(f);
 
-        /* We don't want to fill the logs with messages about parse errors.
-         * Disable most logging if not running standalone */
-        if (!getenv("SYSTEMD_LOG_LEVEL"))
-                log_set_max_level(LOG_CRIT);
+        fuzz_setup_logging();
 
         (void) settings_load(f, "/dev/null", &s);
 

diff --git a/src/resolve/fuzz-dns-packet.c b/src/resolve/fuzz-dns-packet.c
index de5ee204341838b4d4bbc11d5fee4688f21704be..a5b1fd64f763cbca75ab4195919b74aadb9e5338 100644 (file)
--- a/src/resolve/fuzz-dns-packet.c
+++ b/src/resolve/fuzz-dns-packet.c
@@ -10,6 +10,8 @@ int LLVMFuzzerTestOneInput(const uint8_t *data, size_t size) {
         if (outside_size_range(size, 0, DNS_PACKET_SIZE_MAX))
                 return 0;
 
+        fuzz_setup_logging();
+
         assert_se(dns_packet_new(&p, DNS_PROTOCOL_DNS, 0, DNS_PACKET_SIZE_MAX) >= 0);
         p->size = 0; /* by default append starts after the header, undo that */
         assert_se(dns_packet_append_blob(p, data, size, NULL) >= 0);

diff --git a/src/resolve/fuzz-etc-hosts.c b/src/resolve/fuzz-etc-hosts.c
index bd6d0a8d5d22c807be27f187a8e1c120834e35af..9fb1ee1b0b501077432b52574d29b797e91bd5fd 100644 (file)
--- a/src/resolve/fuzz-etc-hosts.c
+++ b/src/resolve/fuzz-etc-hosts.c
@@ -8,8 +8,7 @@ int LLVMFuzzerTestOneInput(const uint8_t *data, size_t size) {
         _cleanup_fclose_ FILE *f = NULL;
         _cleanup_(etc_hosts_clear) EtcHosts h = {};
 
-        if (!getenv("SYSTEMD_LOG_LEVEL"))
-                log_set_max_level(LOG_CRIT);
+        fuzz_setup_logging();
 
         f = data_to_file(data, size);
         assert_se(f);

diff --git a/src/resolve/fuzz-resource-record.c b/src/resolve/fuzz-resource-record.c
index 347272135641d420a033150831465952e79c68ba..358a5c7594b887b9805724957541bc8996059987 100644 (file)
--- a/src/resolve/fuzz-resource-record.c
+++ b/src/resolve/fuzz-resource-record.c
@@ -18,6 +18,8 @@ int LLVMFuzzerTestOneInput(const uint8_t *data, size_t size) {
         if (dns_resource_record_new_from_raw(&rr, data, size) < 0)
                 return 0;
 
+        fuzz_setup_logging();
+
         assert_se(copy = dns_resource_record_copy(rr));
         assert_se(dns_resource_record_equal(copy, rr) > 0);
 

diff --git a/src/systemctl/fuzz-systemctl-parse-argv.c b/src/systemctl/fuzz-systemctl-parse-argv.c
index a97db68d2dc4ce0e54f4c4cbbe585fd20d9d144e..9ea8f7ae87eb57fc830003006b423d6f68afcfc0 100644 (file)
--- a/src/systemctl/fuzz-systemctl-parse-argv.c
+++ b/src/systemctl/fuzz-systemctl-parse-argv.c
@@ -22,10 +22,7 @@ int LLVMFuzzerTestOneInput(const uint8_t *data, size_t size) {
         if (size > 16*1024)
                 return 0; /* See the comment below about the limit for strv_length(). */
 
-        /* We don't want to fill the logs with messages about parse errors.
-         * Disable most logging if not running standalone */
-        if (!getenv("SYSTEMD_LOG_LEVEL"))
-                log_set_max_level(LOG_CRIT);
+        fuzz_setup_logging();
 
         arg_pager_flags = PAGER_DISABLE; /* We shouldn't execute the pager */
 

diff --git a/src/udev/fido_id/fuzz-fido-id-desc.c b/src/udev/fido_id/fuzz-fido-id-desc.c
index dd2ae5b3acb404d1be486550d8ffc24c2fcc50ee..040d77a48775546cafe71f847cecb2cf9ac4d49a 100644 (file)
--- a/src/udev/fido_id/fuzz-fido-id-desc.c
+++ b/src/udev/fido_id/fuzz-fido-id-desc.c
@@ -10,10 +10,7 @@
 #include "log.h"
 
 int LLVMFuzzerTestOneInput(const uint8_t *data, size_t size) {
-        /* We don't want to fill the logs with messages about parse errors.
-         * Disable most logging if not running standalone */
-        if (!getenv("SYSTEMD_LOG_LEVEL"))
-                log_set_max_level(LOG_CRIT);
+        fuzz_setup_logging();
 
         if (outside_size_range(size, 0, HID_MAX_DESCRIPTOR_SIZE))
                 return 0;

diff --git a/src/udev/fuzz-udev-rules.c b/src/udev/fuzz-udev-rules.c
index aff176eb1bddcb701cd5f7806edf0a552f3d6249..0a1056d4b529c782263f235cf2d822d67a57fba5 100644 (file)
--- a/src/udev/fuzz-udev-rules.c
+++ b/src/udev/fuzz-udev-rules.c
@@ -18,8 +18,7 @@ int LLVMFuzzerTestOneInput(const uint8_t *data, size_t size) {
         if (outside_size_range(size, 0, 65536))
                 return 0;
 
-        if (!getenv("SYSTEMD_LOG_LEVEL"))
-                log_set_max_level(LOG_CRIT);
+        fuzz_setup_logging();
 
         assert_se(fmkostemp_safe(filename, "r+", &f) == 0);
         if (size != 0)

diff --git a/src/udev/net/fuzz-link-parser.c b/src/udev/net/fuzz-link-parser.c
index c809791bc105fdf60e3f11d3fbf8f594ad063d27..2833162cc12216e177c148890c365ba1c3f5e0c2 100644 (file)
--- a/src/udev/net/fuzz-link-parser.c
+++ b/src/udev/net/fuzz-link-parser.c
@@ -14,8 +14,7 @@ int LLVMFuzzerTestOneInput(const uint8_t *data, size_t size) {
         if (outside_size_range(size, 0, 65536))
                 return 0;
 
-        if (!getenv("SYSTEMD_LOG_LEVEL"))
-                log_set_max_level(LOG_CRIT);
+        fuzz_setup_logging();
 
         assert_se(fmkostemp_safe(filename, "r+", &f) == 0);
         if (size != 0)

diff --git a/src/xdg-autostart-generator/fuzz-xdg-desktop.c b/src/xdg-autostart-generator/fuzz-xdg-desktop.c
index b1b035d94e777bbb0f7f27824a7cc04f27915530..9aca797e1ba30a156242e5698419b318fae2fcae 100644 (file)
--- a/src/xdg-autostart-generator/fuzz-xdg-desktop.c
+++ b/src/xdg-autostart-generator/fuzz-xdg-desktop.c
@@ -20,10 +20,7 @@ int LLVMFuzzerTestOneInput(const uint8_t *data, size_t size) {
         if (outside_size_range(size, 0, 65536))
                 return 0;
 
-        /* We don't want to fill the logs with messages about parse errors.
-         * Disable most logging if not running standalone */
-        if (!getenv("SYSTEMD_LOG_LEVEL"))
-                log_set_max_level(LOG_CRIT);
+        fuzz_setup_logging();
 
         assert_se(mkdtemp_malloc("/tmp/fuzz-xdg-desktop-XXXXXX", &tmpdir) >= 0);