From cec3e9a774aa733eaf10ee02ddf31eb94352fdf6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= Date: Sat, 2 Jul 2022 17:43:29 +0200 Subject: [PATCH 1/3] fuzz: rename samples to avoid long test names --- ...4e16295cd14e12a01a5631ea94a3d11d1b52 => sample1} | Bin ...44e65d495388540dc1bf8eae70c46f8b867c => sample2} | Bin ...e509920e8538640ef46feaae66 => buffer-overflow-1} | Bin ...add0ee1eb69ed630dd2cdfb1ca => buffer-overflow-2} | Bin ...3856c321a8a7b06589df9b2ff2e0d866a => crash-null} | Bin ...3bea62f541dfa3017c64ea2f1 => infinite-loop-recv} | Bin ...b656baab29065ce634ad5b => infinite-loop-timeout} | Bin ...ve-backup-slave.netdev => 25-bond-backup.netdev} | 0 ...el-independent.netdev => 25-ipip-tunnel2.netdev} | 0 ...critical-connection => dhcp-critical-connection} | 0 ...5d4e95c47e9749b3f4a2dbc0580c20d3 => double-free} | 0 ...e625fa5419a821009b5eb4d809b7 => no-mount-source} | 0 ...8bf4adea54537d21e3afb396e1a55c5b58bf => timeout} | Bin ...sDaemon.Power.desktop => SettingsDaemon.desktop} | 0 14 files changed, 0 insertions(+), 0 deletions(-) rename test/fuzz/fuzz-dhcp-server-relay/{7d924e16295cd14e12a01a5631ea94a3d11d1b52 => sample1} (100%) rename test/fuzz/fuzz-dhcp-server-relay/{fe4344e65d495388540dc1bf8eae70c46f8b867c => sample2} (100%) rename test/fuzz/fuzz-dhcp-server/{crash-64c861ad981838e509920e8538640ef46feaae66 => buffer-overflow-1} (100%) rename test/fuzz/fuzz-dhcp-server/{crash-e13ccbc34d0fa5add0ee1eb69ed630dd2cdfb1ca => buffer-overflow-2} (100%) rename test/fuzz/fuzz-dns-packet/{crash-497be373856c321a8a7b06589df9b2ff2e0d866a => crash-null} (100%) rename test/fuzz/fuzz-ndisc-rs/{timeout-2815b773c712fa33bea62f541dfa3017c64ea2f1 => infinite-loop-recv} (100%) rename test/fuzz/fuzz-ndisc-rs/{timeout-61fff7fd1e5dcc07e1b656baab29065ce634ad5b => infinite-loop-timeout} (100%) rename test/fuzz/fuzz-netdev-parser/{25-bond-active-backup-slave.netdev => 25-bond-backup.netdev} (100%) rename test/fuzz/fuzz-netdev-parser/{25-ipip-tunnel-independent.netdev => 25-ipip-tunnel2.netdev} (100%) rename test/fuzz/fuzz-network-parser/{dhcp-client-critical-connection => dhcp-critical-connection} (100%) rename test/fuzz/fuzz-nspawn-oci/{crash-bffbd2085d4e95c47e9749b3f4a2dbc0580c20d3 => double-free} (100%) rename test/fuzz/fuzz-nspawn-oci/{crash-db0595479ee2e625fa5419a821009b5eb4d809b7 => no-mount-source} (100%) rename test/fuzz/fuzz-varlink/{timeout-d8a88bf4adea54537d21e3afb396e1a55c5b58bf => timeout} (100%) rename test/fuzz/fuzz-xdg-desktop/{org.gnome.SettingsDaemon.Power.desktop => SettingsDaemon.desktop} (100%) diff --git a/test/fuzz/fuzz-dhcp-server-relay/7d924e16295cd14e12a01a5631ea94a3d11d1b52 b/test/fuzz/fuzz-dhcp-server-relay/sample1 similarity index 100% rename from test/fuzz/fuzz-dhcp-server-relay/7d924e16295cd14e12a01a5631ea94a3d11d1b52 rename to test/fuzz/fuzz-dhcp-server-relay/sample1 diff --git a/test/fuzz/fuzz-dhcp-server-relay/fe4344e65d495388540dc1bf8eae70c46f8b867c b/test/fuzz/fuzz-dhcp-server-relay/sample2 similarity index 100% rename from test/fuzz/fuzz-dhcp-server-relay/fe4344e65d495388540dc1bf8eae70c46f8b867c rename to test/fuzz/fuzz-dhcp-server-relay/sample2 diff --git a/test/fuzz/fuzz-dhcp-server/crash-64c861ad981838e509920e8538640ef46feaae66 b/test/fuzz/fuzz-dhcp-server/buffer-overflow-1 similarity index 100% rename from test/fuzz/fuzz-dhcp-server/crash-64c861ad981838e509920e8538640ef46feaae66 rename to test/fuzz/fuzz-dhcp-server/buffer-overflow-1 diff --git a/test/fuzz/fuzz-dhcp-server/crash-e13ccbc34d0fa5add0ee1eb69ed630dd2cdfb1ca b/test/fuzz/fuzz-dhcp-server/buffer-overflow-2 similarity index 100% rename from test/fuzz/fuzz-dhcp-server/crash-e13ccbc34d0fa5add0ee1eb69ed630dd2cdfb1ca rename to test/fuzz/fuzz-dhcp-server/buffer-overflow-2 diff --git a/test/fuzz/fuzz-dns-packet/crash-497be373856c321a8a7b06589df9b2ff2e0d866a b/test/fuzz/fuzz-dns-packet/crash-null similarity index 100% rename from test/fuzz/fuzz-dns-packet/crash-497be373856c321a8a7b06589df9b2ff2e0d866a rename to test/fuzz/fuzz-dns-packet/crash-null diff --git a/test/fuzz/fuzz-ndisc-rs/timeout-2815b773c712fa33bea62f541dfa3017c64ea2f1 b/test/fuzz/fuzz-ndisc-rs/infinite-loop-recv similarity index 100% rename from test/fuzz/fuzz-ndisc-rs/timeout-2815b773c712fa33bea62f541dfa3017c64ea2f1 rename to test/fuzz/fuzz-ndisc-rs/infinite-loop-recv diff --git a/test/fuzz/fuzz-ndisc-rs/timeout-61fff7fd1e5dcc07e1b656baab29065ce634ad5b b/test/fuzz/fuzz-ndisc-rs/infinite-loop-timeout similarity index 100% rename from test/fuzz/fuzz-ndisc-rs/timeout-61fff7fd1e5dcc07e1b656baab29065ce634ad5b rename to test/fuzz/fuzz-ndisc-rs/infinite-loop-timeout diff --git a/test/fuzz/fuzz-netdev-parser/25-bond-active-backup-slave.netdev b/test/fuzz/fuzz-netdev-parser/25-bond-backup.netdev similarity index 100% rename from test/fuzz/fuzz-netdev-parser/25-bond-active-backup-slave.netdev rename to test/fuzz/fuzz-netdev-parser/25-bond-backup.netdev diff --git a/test/fuzz/fuzz-netdev-parser/25-ipip-tunnel-independent.netdev b/test/fuzz/fuzz-netdev-parser/25-ipip-tunnel2.netdev similarity index 100% rename from test/fuzz/fuzz-netdev-parser/25-ipip-tunnel-independent.netdev rename to test/fuzz/fuzz-netdev-parser/25-ipip-tunnel2.netdev diff --git a/test/fuzz/fuzz-network-parser/dhcp-client-critical-connection b/test/fuzz/fuzz-network-parser/dhcp-critical-connection similarity index 100% rename from test/fuzz/fuzz-network-parser/dhcp-client-critical-connection rename to test/fuzz/fuzz-network-parser/dhcp-critical-connection diff --git a/test/fuzz/fuzz-nspawn-oci/crash-bffbd2085d4e95c47e9749b3f4a2dbc0580c20d3 b/test/fuzz/fuzz-nspawn-oci/double-free similarity index 100% rename from test/fuzz/fuzz-nspawn-oci/crash-bffbd2085d4e95c47e9749b3f4a2dbc0580c20d3 rename to test/fuzz/fuzz-nspawn-oci/double-free diff --git a/test/fuzz/fuzz-nspawn-oci/crash-db0595479ee2e625fa5419a821009b5eb4d809b7 b/test/fuzz/fuzz-nspawn-oci/no-mount-source similarity index 100% rename from test/fuzz/fuzz-nspawn-oci/crash-db0595479ee2e625fa5419a821009b5eb4d809b7 rename to test/fuzz/fuzz-nspawn-oci/no-mount-source diff --git a/test/fuzz/fuzz-varlink/timeout-d8a88bf4adea54537d21e3afb396e1a55c5b58bf b/test/fuzz/fuzz-varlink/timeout similarity index 100% rename from test/fuzz/fuzz-varlink/timeout-d8a88bf4adea54537d21e3afb396e1a55c5b58bf rename to test/fuzz/fuzz-varlink/timeout diff --git a/test/fuzz/fuzz-xdg-desktop/org.gnome.SettingsDaemon.Power.desktop b/test/fuzz/fuzz-xdg-desktop/SettingsDaemon.desktop similarity index 100% rename from test/fuzz/fuzz-xdg-desktop/org.gnome.SettingsDaemon.Power.desktop rename to test/fuzz/fuzz-xdg-desktop/SettingsDaemon.desktop From 6f52e1c63bdb6c00f37a91f24e0704fa5cb08b65 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= Date: Mon, 4 Jul 2022 19:59:06 +0200 Subject: [PATCH 2/3] man: fix link to glob(3) --- man/loader.conf.xml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/man/loader.conf.xml b/man/loader.conf.xml index ef0822deaa..3606de5704 100644 --- a/man/loader.conf.xml +++ b/man/loader.conf.xml @@ -114,9 +114,9 @@ Supported glob wildcard patterns are ?, *, and […] (including ranges). Note that these patterns use the same syntax as - glob7, but do not - support all features. In particular, set negation and named character classes are not supported. The - matching is done case-insensitively on the entry ID (as shown by bootctl + glob7, + but do not support all features. In particular, set negation and named character classes are not + supported. The matching is done case-insensitively on the entry ID (as shown by bootctl list). From 891fc28b457fe4b458348687040bf8382fa195ca Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= Date: Tue, 5 Jul 2022 21:48:55 +0200 Subject: [PATCH 3/3] tree-wide: drop duplicated semicolons --- src/network/networkd-ndisc.c | 2 +- src/network/networkd-sysctl.c | 2 +- src/resolve/resolvectl.c | 2 +- src/resolve/resolved-dnssd.c | 2 +- src/sleep/sleep.c | 2 +- src/udev/udev-rules.c | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/network/networkd-ndisc.c b/src/network/networkd-ndisc.c index 2b663e57cc..f66745a4ff 100644 --- a/src/network/networkd-ndisc.c +++ b/src/network/networkd-ndisc.c @@ -527,7 +527,7 @@ static int ndisc_router_process_onlink_prefix(Link *link, sd_ndisc_router *rt) { r = ndisc_request_route(TAKE_PTR(route), link, rt); if (r < 0) - return log_link_error_errno(link, r, "Could not request prefix route: %m");; + return log_link_error_errno(link, r, "Could not request prefix route: %m"); return 0; } diff --git a/src/network/networkd-sysctl.c b/src/network/networkd-sysctl.c index 68d55ed84d..894e608815 100644 --- a/src/network/networkd-sysctl.c +++ b/src/network/networkd-sysctl.c @@ -256,7 +256,7 @@ int link_set_sysctl(Link *link) { r = link_set_ipv6_forward(link); if (r < 0) - log_link_warning_errno(link, r, "Cannot configure IPv6 packet forwarding, ignoring: %m");; + log_link_warning_errno(link, r, "Cannot configure IPv6 packet forwarding, ignoring: %m"); r = link_set_ipv6_privacy_extensions(link); if (r < 0) diff --git a/src/resolve/resolvectl.c b/src/resolve/resolvectl.c index 245c273fde..aaa1c497c0 100644 --- a/src/resolve/resolvectl.c +++ b/src/resolve/resolvectl.c @@ -811,7 +811,7 @@ static int resolve_service(sd_bus *bus, const char *name, const char *type, cons while ((r = sd_bus_message_enter_container(reply, 'r', "iiay")) > 0) { _cleanup_free_ char *pretty = NULL; int ifindex, family, k; - union in_addr_union a;; + union in_addr_union a; assert_cc(sizeof(int) == sizeof(int32_t)); diff --git a/src/resolve/resolved-dnssd.c b/src/resolve/resolved-dnssd.c index 9c2594c1ba..02462599be 100644 --- a/src/resolve/resolved-dnssd.c +++ b/src/resolve/resolved-dnssd.c @@ -200,7 +200,7 @@ int dnssd_load(Manager *manager) { STRV_FOREACH_BACKWARDS(f, files) { r = dnssd_service_load(manager, *f); if (r < 0) - log_warning_errno(r, "Failed to load '%s': %m", *f);; + log_warning_errno(r, "Failed to load '%s': %m", *f); } return 0; diff --git a/src/sleep/sleep.c b/src/sleep/sleep.c index 65e391d02a..58003efdfe 100644 --- a/src/sleep/sleep.c +++ b/src/sleep/sleep.c @@ -224,7 +224,7 @@ static int execute( r = write_mode(modes); if (r < 0) - return log_error_errno(r, "Failed to write mode to /sys/power/disk: %m");; + return log_error_errno(r, "Failed to write mode to /sys/power/disk: %m"); } /* Pass an action string to the call-outs. This is mostly our operation string, except if the diff --git a/src/udev/udev-rules.c b/src/udev/udev-rules.c index f95b751b75..6e8a2967b5 100644 --- a/src/udev/udev-rules.c +++ b/src/udev/udev-rules.c @@ -2128,7 +2128,7 @@ static int udev_rule_apply_token_to_event( if (r == -ENOMEM) return log_oom(); if (r < 0) - return log_rule_error_errno(dev, rules, r, "Failed to store SECLABEL{%s}='%s': %m", name, label);; + return log_rule_error_errno(dev, rules, r, "Failed to store SECLABEL{%s}='%s': %m", name, label); log_rule_debug(dev, rules, "SECLABEL{%s}='%s'", name, label);