From b3bfb95178a8dce6bf3db9337bb0d3901485883b Mon Sep 17 00:00:00 2001 From: Frantisek Sumsal Date: Wed, 25 Oct 2023 11:16:37 +0200 Subject: [PATCH 1/5] coccinelle: don't run iovec-make on iovec_done{,_erase} As the result is a bit funky (but still valid), i.e.: static inline void iovec_done_erase(struct iovec *iovec) { assert(iovec); - iovec->iov_base = erase_and_free(iovec->iov_base); - iovec->iov_len = 0; + *iovec = IOVEC_MAKE(erase_and_free(iovec->iov_base), 0); } --- coccinelle/iovec-make.cocci | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/coccinelle/iovec-make.cocci b/coccinelle/iovec-make.cocci index 79116882fc..bbbf4a2b00 100644 --- a/coccinelle/iovec-make.cocci +++ b/coccinelle/iovec-make.cocci @@ -13,9 +13,13 @@ expression x, p, l; - x.iov_len = l; + x = IOVEC_MAKE(p, l); @@ +/* Don't run this transformation on iovec_done() and iovec_done_erase(), + * since the result, albeit correct, is a bit funky. */ + position pos : script:python() { pos[0].current_element != "iovec_done" and + pos[0].current_element != "iovec_done_erase" }; expression x, p, l; @@ -- x->iov_base = p; +- x->iov_base@pos = p; - x->iov_len = l; + *x = IOVEC_MAKE(p, l); @@ From c8ccd444a2767de4d75c54b80038b054f3bc1050 Mon Sep 17 00:00:00 2001 From: Frantisek Sumsal Date: Wed, 25 Oct 2023 11:21:40 +0200 Subject: [PATCH 2/5] core,journal: drop unnecessary !! casts --- src/core/unit.c | 2 +- src/journal/journalctl.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/core/unit.c b/src/core/unit.c index e5598d32dd..d12829c31f 100644 --- a/src/core/unit.c +++ b/src/core/unit.c @@ -5390,7 +5390,7 @@ int unit_set_exec_params(Unit *u, ExecParameters *p) { p->received_credentials_directory = u->manager->received_credentials_directory; p->received_encrypted_credentials_directory = u->manager->received_encrypted_credentials_directory; - p->shall_confirm_spawn = !!u->manager->confirm_spawn; + p->shall_confirm_spawn = u->manager->confirm_spawn; p->fallback_smack_process_label = u->manager->defaults.smack_process_label; diff --git a/src/journal/journalctl.c b/src/journal/journalctl.c index 9b2eb8fa8e..c52a8d13be 100644 --- a/src/journal/journalctl.c +++ b/src/journal/journalctl.c @@ -318,7 +318,7 @@ static int parse_lines(const char *arg, bool graceful) { } arg_lines = n; - arg_lines_oldest = !!l; + arg_lines_oldest = l; return 1; From 25f7271c42914b2ed7394ba9483117623f30df53 Mon Sep 17 00:00:00 2001 From: Frantisek Sumsal Date: Wed, 25 Oct 2023 11:26:19 +0200 Subject: [PATCH 3/5] =?UTF-8?q?network:=20ENOTSUP=20=E2=86=92=20EOPNOTSUPP?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/libsystemd-network/ndisc-router.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/libsystemd-network/ndisc-router.c b/src/libsystemd-network/ndisc-router.c index 74331591f0..5162df799c 100644 --- a/src/libsystemd-network/ndisc-router.c +++ b/src/libsystemd-network/ndisc-router.c @@ -593,7 +593,7 @@ int sd_ndisc_router_route_get_preference(sd_ndisc_router *rt, unsigned *ret) { return r; if (!IN_SET((ri[3] >> 3) & 3, SD_NDISC_PREFERENCE_LOW, SD_NDISC_PREFERENCE_MEDIUM, SD_NDISC_PREFERENCE_HIGH)) - return -ENOTSUP; + return -EOPNOTSUPP; *ret = (ri[3] >> 3) & 3; return 0; From 73151fbe3095d2a3d12bcead919f8bc4dcc45662 Mon Sep 17 00:00:00 2001 From: Frantisek Sumsal Date: Wed, 25 Oct 2023 11:28:12 +0200 Subject: [PATCH 4/5] network: use timestamp_is_set() in one more place --- src/network/networkd-radv.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/network/networkd-radv.c b/src/network/networkd-radv.c index 80c0fe43a8..fc36a001f8 100644 --- a/src/network/networkd-radv.c +++ b/src/network/networkd-radv.c @@ -1607,7 +1607,7 @@ int config_parse_router_home_agent_lifetime( return 0; } - if (usec == USEC_INFINITY || usec == 0 || + if (!timestamp_is_set(usec) || usec > RADV_HOME_AGENT_MAX_LIFETIME_USEC) { log_syntax(unit, LOG_WARNING, filename, line, 0, "Invalid [%s] %s=, ignoring assignment: %s", section, lvalue, rvalue); From 1a9a61f9cc075a5063af7e9c5a2022094243047b Mon Sep 17 00:00:00 2001 From: Frantisek Sumsal Date: Wed, 25 Oct 2023 11:29:20 +0200 Subject: [PATCH 5/5] =?UTF-8?q?udev:=20strdupa()=20=E2=86=92=20strdupa=5Fs?= =?UTF-8?q?afe()?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/udev/udev-builtin-net_id.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/udev/udev-builtin-net_id.c b/src/udev/udev-builtin-net_id.c index d88d4f7dd5..91b40088f4 100644 --- a/src/udev/udev-builtin-net_id.c +++ b/src/udev/udev-builtin-net_id.c @@ -921,7 +921,7 @@ static int get_usb_specifier(sd_device *dev, char **ret) { return log_device_debug_errno(dev, SYNTHETIC_ERRNO(EINVAL), "sysname \"%s\" does not have '-' in the expected place.", sysname); - ports = strdupa(s + 1); + ports = strdupa_safe(s + 1); s = strchr(ports, ':'); if (!s) return log_device_debug_errno(dev, SYNTHETIC_ERRNO(EINVAL),