From 5a943bae125ff54b68070a2e76af39b065f02848 Mon Sep 17 00:00:00 2001 From: Yu Watanabe Date: Sun, 16 Nov 2025 13:59:56 +0900 Subject: [PATCH 1/4] network-internal: do not save partially parsed values --- src/libsystemd-network/network-internal.c | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/src/libsystemd-network/network-internal.c b/src/libsystemd-network/network-internal.c index e7c22c9b76..c8aa6b63e0 100644 --- a/src/libsystemd-network/network-internal.c +++ b/src/libsystemd-network/network-internal.c @@ -261,8 +261,7 @@ int deserialize_dhcp_routes(struct sd_dhcp_route **ret, size_t *ret_size, const if (r == 0) break; - if (!GREEDY_REALLOC(routes, size + 1)) - return -ENOMEM; + struct sd_dhcp_route route = {}; tok = word; @@ -272,7 +271,7 @@ int deserialize_dhcp_routes(struct sd_dhcp_route **ret, size_t *ret_size, const continue; *tok_end = '\0'; - r = inet_aton(tok, &routes[size].dst_addr); + r = inet_aton(tok, &route.dst_addr); if (r == 0) continue; @@ -289,15 +288,18 @@ int deserialize_dhcp_routes(struct sd_dhcp_route **ret, size_t *ret_size, const if (r < 0 || n > 32) continue; - routes[size].dst_prefixlen = (uint8_t) n; + route.dst_prefixlen = (uint8_t) n; tok = tok_end + 1; /* get the gateway */ - r = inet_aton(tok, &routes[size].gw_addr); + r = inet_aton(tok, &route.gw_addr); if (r == 0) continue; - size++; + if (!GREEDY_REALLOC(routes, size + 1)) + return -ENOMEM; + + routes[size++] = route; } *ret_size = size; From 33b2dc77bdc3fe0f8e26068af806075aaf9d6c0b Mon Sep 17 00:00:00 2001 From: Yu Watanabe Date: Sun, 16 Nov 2025 11:25:47 +0900 Subject: [PATCH 2/4] test-network: migrate to use ASSERT_OK() and friends --- src/network/test-network.c | 288 +++++++++++++++---------------------- 1 file changed, 119 insertions(+), 169 deletions(-) diff --git a/src/network/test-network.c b/src/network/test-network.c index fbeed4f316..3831ee9e76 100644 --- a/src/network/test-network.c +++ b/src/network/test-network.c @@ -13,91 +13,78 @@ #include "strv.h" #include "tests.h" -static void test_deserialize_in_addr(void) { +TEST(deserialize_in_addr) { _cleanup_free_ struct in_addr *addresses = NULL; _cleanup_free_ struct in6_addr *addresses6 = NULL; union in_addr_union a, b, c, d, e, f; - int size; - const char *addresses_string = "192.168.0.1 0:0:0:0:0:FFFF:204.152.189.116 192.168.0.2 ::1 192.168.0.3 1:0:0:0:0:0:0:8"; + static const char *addresses_string = "192.168.0.1 0:0:0:0:0:FFFF:204.152.189.116 192.168.0.2 ::1 192.168.0.3 1:0:0:0:0:0:0:8"; - assert_se(in_addr_from_string(AF_INET, "0:0:0:0:0:FFFF:204.152.189.116", &a) < 0); - assert_se(in_addr_from_string(AF_INET6, "192.168.0.1", &d) < 0); + ASSERT_ERROR(in_addr_from_string(AF_INET, "0:0:0:0:0:FFFF:204.152.189.116", &a), EINVAL); + ASSERT_ERROR(in_addr_from_string(AF_INET6, "192.168.0.1", &d), EINVAL); - assert_se(in_addr_from_string(AF_INET, "192.168.0.1", &a) >= 0); - assert_se(in_addr_from_string(AF_INET, "192.168.0.2", &b) >= 0); - assert_se(in_addr_from_string(AF_INET, "192.168.0.3", &c) >= 0); - assert_se(in_addr_from_string(AF_INET6, "0:0:0:0:0:FFFF:204.152.189.116", &d) >= 0); - assert_se(in_addr_from_string(AF_INET6, "::1", &e) >= 0); - assert_se(in_addr_from_string(AF_INET6, "1:0:0:0:0:0:0:8", &f) >= 0); + ASSERT_OK(in_addr_from_string(AF_INET, "192.168.0.1", &a)); + ASSERT_OK(in_addr_from_string(AF_INET, "192.168.0.2", &b)); + ASSERT_OK(in_addr_from_string(AF_INET, "192.168.0.3", &c)); + ASSERT_OK(in_addr_from_string(AF_INET6, "0:0:0:0:0:FFFF:204.152.189.116", &d)); + ASSERT_OK(in_addr_from_string(AF_INET6, "::1", &e)); + ASSERT_OK(in_addr_from_string(AF_INET6, "1:0:0:0:0:0:0:8", &f)); - assert_se((size = deserialize_in_addrs(&addresses, addresses_string)) >= 0); - assert_se(size == 3); - assert_se(in4_addr_equal(&a.in, &addresses[0])); - assert_se(in4_addr_equal(&b.in, &addresses[1])); - assert_se(in4_addr_equal(&c.in, &addresses[2])); + ASSERT_OK_EQ(deserialize_in_addrs(&addresses, addresses_string), 3); + ASSERT_NOT_NULL(addresses); + ASSERT_TRUE(in4_addr_equal(&a.in, &addresses[0])); + ASSERT_TRUE(in4_addr_equal(&b.in, &addresses[1])); + ASSERT_TRUE(in4_addr_equal(&c.in, &addresses[2])); - assert_se((size = deserialize_in6_addrs(&addresses6, addresses_string)) >= 0); - assert_se(size == 3); - assert_se(in6_addr_equal(&d.in6, &addresses6[0])); - assert_se(in6_addr_equal(&e.in6, &addresses6[1])); - assert_se(in6_addr_equal(&f.in6, &addresses6[2])); + ASSERT_OK_EQ(deserialize_in6_addrs(&addresses6, addresses_string), 3); + ASSERT_NOT_NULL(addresses6); + ASSERT_TRUE(in6_addr_equal(&d.in6, &addresses6[0])); + ASSERT_TRUE(in6_addr_equal(&e.in6, &addresses6[1])); + ASSERT_TRUE(in6_addr_equal(&f.in6, &addresses6[2])); } -static void test_deserialize_dhcp_routes(void) { +TEST(deserialize_dhcp_routes) { + _cleanup_free_ struct sd_dhcp_route *routes = NULL; size_t size; - { - _cleanup_free_ struct sd_dhcp_route *routes = NULL; - assert_se(deserialize_dhcp_routes(&routes, &size, "") >= 0); - assert_se(size == 0); - } + ASSERT_OK(deserialize_dhcp_routes(&routes, &size, "")); + ASSERT_EQ(size, 0U); + ASSERT_NULL(routes); - { - /* no errors */ - _cleanup_free_ struct sd_dhcp_route *routes = NULL; - const char *routes_string = "192.168.0.0/16,192.168.0.1 10.1.2.0/24,10.1.2.1 0.0.0.0/0,10.0.1.1"; + ASSERT_OK(deserialize_dhcp_routes(&routes, &size, "192.168.0.0/16,192.168.0.1 10.1.2.0/24,10.1.2.1 0.0.0.0/0,10.0.1.1")); + ASSERT_EQ(size, 3U); + ASSERT_NOT_NULL(routes); - assert_se(deserialize_dhcp_routes(&routes, &size, routes_string) >= 0); + ASSERT_EQ(routes[0].dst_addr.s_addr, inet_addr("192.168.0.0")); + ASSERT_EQ(routes[0].gw_addr.s_addr, inet_addr("192.168.0.1")); + ASSERT_EQ(routes[0].dst_prefixlen, 16U); - assert_se(size == 3); - assert_se(routes[0].dst_addr.s_addr == inet_addr("192.168.0.0")); - assert_se(routes[0].gw_addr.s_addr == inet_addr("192.168.0.1")); - assert_se(routes[0].dst_prefixlen == 16); + ASSERT_EQ(routes[1].dst_addr.s_addr, inet_addr("10.1.2.0")); + ASSERT_EQ(routes[1].gw_addr.s_addr, inet_addr("10.1.2.1")); + ASSERT_EQ(routes[1].dst_prefixlen, 24U); - assert_se(routes[1].dst_addr.s_addr == inet_addr("10.1.2.0")); - assert_se(routes[1].gw_addr.s_addr == inet_addr("10.1.2.1")); - assert_se(routes[1].dst_prefixlen == 24); + ASSERT_EQ(routes[2].dst_addr.s_addr, inet_addr("0.0.0.0")); + ASSERT_EQ(routes[2].gw_addr.s_addr, inet_addr("10.0.1.1")); + ASSERT_EQ(routes[2].dst_prefixlen, 0U); - assert_se(routes[2].dst_addr.s_addr == inet_addr("0.0.0.0")); - assert_se(routes[2].gw_addr.s_addr == inet_addr("10.0.1.1")); - assert_se(routes[2].dst_prefixlen == 0); - } + routes = mfree(routes); - { - /* error in second word */ - _cleanup_free_ struct sd_dhcp_route *routes = NULL; - const char *routes_string = "192.168.0.0/16,192.168.0.1 10.1.2.0#24,10.1.2.1 0.0.0.0/0,10.0.1.1"; + ASSERT_OK(deserialize_dhcp_routes(&routes, &size, "192.168.0.0/16,192.168.0.1 10.1.2.0#24,10.1.2.1 0.0.0.0/0,10.0.1.1")); + ASSERT_EQ(size, 2U); + ASSERT_NOT_NULL(routes); - assert_se(deserialize_dhcp_routes(&routes, &size, routes_string) >= 0); + ASSERT_EQ(routes[0].dst_addr.s_addr, inet_addr("192.168.0.0")); + ASSERT_EQ(routes[0].gw_addr.s_addr, inet_addr("192.168.0.1")); + ASSERT_EQ(routes[0].dst_prefixlen, 16U); - assert_se(size == 2); - assert_se(routes[0].dst_addr.s_addr == inet_addr("192.168.0.0")); - assert_se(routes[0].gw_addr.s_addr == inet_addr("192.168.0.1")); - assert_se(routes[0].dst_prefixlen == 16); + ASSERT_EQ(routes[1].dst_addr.s_addr, inet_addr("0.0.0.0")); + ASSERT_EQ(routes[1].gw_addr.s_addr, inet_addr("10.0.1.1")); + ASSERT_EQ(routes[1].dst_prefixlen, 0U); - assert_se(routes[1].dst_addr.s_addr == inet_addr("0.0.0.0")); - assert_se(routes[1].gw_addr.s_addr == inet_addr("10.0.1.1")); - assert_se(routes[1].dst_prefixlen == 0); - } + routes = mfree(routes); - { - /* error in every word */ - _cleanup_free_ struct sd_dhcp_route *routes = NULL; - const char *routes_string = "192.168.0.0/55,192.168.0.1 10.1.2.0#24,10.1.2.1 0.0.0.0/0,10.0.1.X"; - - assert_se(deserialize_dhcp_routes(&routes, &size, routes_string) >= 0); - assert_se(size == 0); - } + ASSERT_OK(deserialize_dhcp_routes(&routes, &size, "192.168.0.0/55,192.168.0.1 10.1.2.0#24,10.1.2.1 0.0.0.0/0,10.0.1.X")); + ASSERT_EQ(size, 0U); + ASSERT_NULL(routes); } static void test_route_tables_one(Manager *manager, const char *name, uint32_t number) { @@ -105,31 +92,36 @@ static void test_route_tables_one(Manager *manager, const char *name, uint32_t n uint32_t t; if (!STR_IN_SET(name, "default", "main", "local")) { - assert_se(streq(hashmap_get(manager->route_table_names_by_number, UINT32_TO_PTR(number)), name)); - assert_se(PTR_TO_UINT32(hashmap_get(manager->route_table_numbers_by_name, name)) == number); + ASSERT_STREQ(hashmap_get(manager->route_table_names_by_number, UINT32_TO_PTR(number)), name); + ASSERT_EQ(PTR_TO_UINT32(hashmap_get(manager->route_table_numbers_by_name, name)), number); } - assert_se(asprintf(&expected, "%s(%" PRIu32 ")", name, number) >= 0); - assert_se(manager_get_route_table_to_string(manager, number, /* append_num = */ true, &str) >= 0); - assert_se(streq(str, expected)); + ASSERT_OK(asprintf(&expected, "%s(%" PRIu32 ")", name, number)); + ASSERT_OK(manager_get_route_table_to_string(manager, number, /* append_num = */ true, &str)); + ASSERT_STREQ(str, expected); str = mfree(str); - assert_se(manager_get_route_table_to_string(manager, number, /* append_num = */ false, &str) >= 0); - assert_se(streq(str, name)); + ASSERT_OK(manager_get_route_table_to_string(manager, number, /* append_num = */ false, &str)); + ASSERT_STREQ(str, name); - assert_se(manager_get_route_table_from_string(manager, name, &t) >= 0); - assert_se(t == number); + ASSERT_OK(manager_get_route_table_from_string(manager, name, &t)); + ASSERT_EQ(t, number); - assert_se(asprintf(&num_str, "%" PRIu32, number) >= 0); - assert_se(manager_get_route_table_from_string(manager, num_str, &t) >= 0); - assert_se(t == number); + ASSERT_OK(asprintf(&num_str, "%" PRIu32, number)); + ASSERT_OK(manager_get_route_table_from_string(manager, num_str, &t)); + ASSERT_EQ(t, number); } -static void test_route_tables(Manager *manager) { - assert_se(config_parse_route_table_names("manager", "filename", 1, "section", 1, "RouteTable", 0, "hoge:123 foo:456 aaa:111", manager, manager) >= 0); - assert_se(config_parse_route_table_names("manager", "filename", 1, "section", 1, "RouteTable", 0, "bbb:11111 ccc:22222", manager, manager) >= 0); - assert_se(config_parse_route_table_names("manager", "filename", 1, "section", 1, "RouteTable", 0, "ddd:22222", manager, manager) >= 0); +TEST(route_tables) { + _cleanup_(manager_freep) Manager *manager = NULL; + + ASSERT_OK(manager_new(&manager, /* test_mode = */ true)); + ASSERT_OK(manager_setup(manager)); + + ASSERT_OK(config_parse_route_table_names("manager", "filename", 1, "section", 1, "RouteTable", 0, "hoge:123 foo:456 aaa:111", manager, manager)); + ASSERT_OK(config_parse_route_table_names("manager", "filename", 1, "section", 1, "RouteTable", 0, "bbb:11111 ccc:22222", manager, manager)); + ASSERT_OK(config_parse_route_table_names("manager", "filename", 1, "section", 1, "RouteTable", 0, "ddd:22222", manager, manager)); test_route_tables_one(manager, "hoge", 123); test_route_tables_one(manager, "foo", 456); @@ -137,110 +129,68 @@ static void test_route_tables(Manager *manager) { test_route_tables_one(manager, "bbb", 11111); test_route_tables_one(manager, "ccc", 22222); - assert_se(!hashmap_get(manager->route_table_numbers_by_name, "ddd")); + ASSERT_NULL(hashmap_get(manager->route_table_numbers_by_name, "ddd")); test_route_tables_one(manager, "default", 253); test_route_tables_one(manager, "main", 254); test_route_tables_one(manager, "local", 255); - assert_se(config_parse_route_table_names("manager", "filename", 1, "section", 1, "RouteTable", 0, "", manager, manager) >= 0); - assert_se(!manager->route_table_names_by_number); - assert_se(!manager->route_table_numbers_by_name); + ASSERT_OK(config_parse_route_table_names("manager", "filename", 1, "section", 1, "RouteTable", 0, "", manager, manager)); + ASSERT_NULL(manager->route_table_names_by_number); + ASSERT_NULL(manager->route_table_numbers_by_name); /* Invalid pairs */ - assert_se(config_parse_route_table_names("manager", "filename", 1, "section", 1, "RouteTable", 0, "main:123 default:333 local:999", manager, manager) >= 0); - assert_se(config_parse_route_table_names("manager", "filename", 1, "section", 1, "RouteTable", 0, "xxx:253 yyy:254 local:255", manager, manager) >= 0); - assert_se(config_parse_route_table_names("manager", "filename", 1, "section", 1, "RouteTable", 0, "1234:321 :567 hoge:foo aaa:-888", manager, manager) >= 0); - assert_se(!manager->route_table_names_by_number); - assert_se(!manager->route_table_numbers_by_name); + ASSERT_OK(config_parse_route_table_names("manager", "filename", 1, "section", 1, "RouteTable", 0, "main:123 default:333 local:999", manager, manager)); + ASSERT_OK(config_parse_route_table_names("manager", "filename", 1, "section", 1, "RouteTable", 0, "xxx:253 yyy:254 local:255", manager, manager)); + ASSERT_OK(config_parse_route_table_names("manager", "filename", 1, "section", 1, "RouteTable", 0, "1234:321 :567 hoge:foo aaa:-888", manager, manager)); + ASSERT_NULL(manager->route_table_names_by_number); + ASSERT_NULL(manager->route_table_numbers_by_name); test_route_tables_one(manager, "default", 253); test_route_tables_one(manager, "main", 254); test_route_tables_one(manager, "local", 255); } -static int test_load_config(Manager *manager) { - int r; -/* TODO: should_reload, is false if the config dirs do not exist, so - * so we can't do this test here, move it to a test for paths_check_timestamps - * directly - * - * assert_se(network_should_reload(manager) == true); -*/ - - r = manager_load_config(manager); - if (r == -EPERM) - return r; - assert_se(r >= 0); - - return 0; -} - -static void test_dhcp_hostname_shorten_overlong(void) { - int r; - - { - /* simple hostname, no actions, no errors */ - _cleanup_free_ char *shortened = NULL; - r = shorten_overlong("name1", &shortened); - assert_se(r == 0); - assert_se(streq("name1", shortened)); - } - - { - /* simple fqdn, no actions, no errors */ - _cleanup_free_ char *shortened = NULL; - r = shorten_overlong("name1.example.com", &shortened); - assert_se(r == 0); - assert_se(streq("name1.example.com", shortened)); - } - - { - /* overlong fqdn, cut to first dot, no errors */ - _cleanup_free_ char *shortened = NULL; - r = shorten_overlong("name1.test-dhcp-this-one-here-is-a-very-very-long-domain.example.com", &shortened); - assert_se(r == 1); - assert_se(streq("name1", shortened)); - } - - { - /* overlong hostname, cut to HOST_MAX_LEN, no errors */ - _cleanup_free_ char *shortened = NULL; - r = shorten_overlong("test-dhcp-this-one-here-is-a-very-very-long-hostname-without-domainname", &shortened); - assert_se(r == 1); - assert_se(streq("test-dhcp-this-one-here-is-a-very-very-long-hostname-without-dom", shortened)); - } - - { - /* overlong fqdn, cut to first dot, empty result error */ - _cleanup_free_ char *shortened = NULL; - r = shorten_overlong(".test-dhcp-this-one-here-is-a-very-very-long-hostname.example.com", &shortened); - assert_se(r == -EDOM); - assert_se(shortened == NULL); - } -} - -int main(void) { +TEST(manager_enumerate) { _cleanup_(manager_freep) Manager *manager = NULL; - int r; - test_setup_logging(LOG_INFO); + ASSERT_OK(manager_new(&manager, /* test_mode = */ true)); + ASSERT_OK(manager_setup(manager)); - test_deserialize_in_addr(); - test_deserialize_dhcp_routes(); - test_dhcp_hostname_shorten_overlong(); + /* TODO: should_reload, is false if the config dirs do not exist, so we can't do this test here, move + * it to a test for paths_check_timestamps directly. */ + if (ASSERT_OK_OR(manager_load_config(manager), -EPERM) < 0) + return (void) log_tests_skipped("Cannot load configuration files"); - assert_se(manager_new(&manager, /* test_mode = */ true) >= 0); - assert_se(manager_setup(manager) >= 0); - - test_route_tables(manager); - - r = test_load_config(manager); - if (r == -EPERM) - log_debug("Cannot load configuration, ignoring."); - else - assert_se(r == 0); - - assert_se(manager_enumerate(manager) >= 0); - return 0; + ASSERT_OK(manager_enumerate(manager)); } + +TEST(dhcp_hostname_shorten_overlong) { + _cleanup_free_ char *s = NULL; + + /* simple hostname, no actions, no errors */ + ASSERT_OK_ZERO(shorten_overlong("name1", &s)); + ASSERT_STREQ(s, "name1"); + s = mfree(s); + + /* simple fqdn, no actions, no errors */ + ASSERT_OK_ZERO(shorten_overlong("name1.example.com", &s)); + ASSERT_STREQ(s, "name1.example.com"); + s = mfree(s); + + /* overlong fqdn, cut to first dot, no errors */ + ASSERT_OK_POSITIVE(shorten_overlong("name1.test-dhcp-this-one-here-is-a-very-very-long-domain.example.com", &s)); + ASSERT_STREQ(s, "name1"); + s = mfree(s); + + /* overlong hostname, cut to HOST_MAX_LEN, no errors */ + ASSERT_OK_POSITIVE(shorten_overlong("test-dhcp-this-one-here-is-a-very-very-long-hostname-without-domainname", &s)); + ASSERT_STREQ(s, "test-dhcp-this-one-here-is-a-very-very-long-hostname-without-dom"); + s = mfree(s); + + /* overlong fqdn, cut to first dot, empty result error */ + ASSERT_ERROR(shorten_overlong(".test-dhcp-this-one-here-is-a-very-very-long-hostname.example.com", &s), EDOM); + ASSERT_NULL(s); +} + +DEFINE_TEST_MAIN(LOG_INFO); From a112c7646be3ea962a37f660a7099c34d993e9dc Mon Sep 17 00:00:00 2001 From: Yu Watanabe Date: Sun, 16 Nov 2025 11:19:02 +0900 Subject: [PATCH 3/4] tree-wide: swap arguments for streq() We usually set a variable first, then constant. --- src/core/load-fragment.c | 2 +- src/integritysetup/integritysetup.c | 8 ++++---- src/libsystemd/sd-netlink/test-netlink.c | 4 ++-- src/test/test-chase.c | 4 ++-- 4 files changed, 9 insertions(+), 9 deletions(-) diff --git a/src/core/load-fragment.c b/src/core/load-fragment.c index 4b33d918fc..b9c6ea6439 100644 --- a/src/core/load-fragment.c +++ b/src/core/load-fragment.c @@ -4418,7 +4418,7 @@ int config_parse_io_limit( if (r < 0) return 0; - if (streq("infinity", p)) + if (streq(p, "infinity")) num = CGROUP_LIMIT_MAX; else { r = parse_size(p, 1000, &num); diff --git a/src/integritysetup/integritysetup.c b/src/integritysetup/integritysetup.c index 6bb3958fc6..662d5a9b49 100644 --- a/src/integritysetup/integritysetup.c +++ b/src/integritysetup/integritysetup.c @@ -75,13 +75,13 @@ static const char *integrity_algorithm_select(const void *key_file_buf) { /* To keep a bit of sanity for end users, the subset of integrity algorithms we support will match what is used in integritysetup */ if (arg_integrity_algorithm) { - if (streq("hmac-sha256", arg_integrity_algorithm)) + if (streq(arg_integrity_algorithm, "hmac-sha256")) return DM_HMAC_256; - if (streq("hmac-sha512", arg_integrity_algorithm)) + if (streq(arg_integrity_algorithm, "hmac-sha512")) return DM_HMAC_512; - if (streq("phmac-sha256", arg_integrity_algorithm)) + if (streq(arg_integrity_algorithm, "phmac-sha256")) return DM_PHMAC_256; - if (streq("phmac-sha512", arg_integrity_algorithm)) + if (streq(arg_integrity_algorithm, "phmac-sha512")) return DM_PHMAC_512; return arg_integrity_algorithm; } else if (key_file_buf) diff --git a/src/libsystemd/sd-netlink/test-netlink.c b/src/libsystemd/sd-netlink/test-netlink.c index 2a7fb255b0..f127de7705 100644 --- a/src/libsystemd/sd-netlink/test-netlink.c +++ b/src/libsystemd/sd-netlink/test-netlink.c @@ -383,14 +383,14 @@ TEST(message_container) { ASSERT_OK(sd_netlink_message_enter_container(m, IFLA_LINKINFO)); ASSERT_OK(sd_netlink_message_read_string(m, IFLA_INFO_KIND, &string_data)); - ASSERT_STREQ("vlan", string_data); + ASSERT_STREQ(string_data, "vlan"); ASSERT_OK(sd_netlink_message_enter_container(m, IFLA_INFO_DATA)); ASSERT_OK(sd_netlink_message_read_u16(m, IFLA_VLAN_ID, &u16_data)); ASSERT_OK(sd_netlink_message_exit_container(m)); ASSERT_OK(sd_netlink_message_read_string(m, IFLA_INFO_KIND, &string_data)); - ASSERT_STREQ("vlan", string_data); + ASSERT_STREQ(string_data, "vlan"); ASSERT_OK(sd_netlink_message_exit_container(m)); ASSERT_FAIL(sd_netlink_message_read_u32(m, IFLA_LINKINFO, &u32_data)); diff --git a/src/test/test-chase.c b/src/test/test-chase.c index 4f6e006d5e..89705b4ffd 100644 --- a/src/test/test-chase.c +++ b/src/test/test-chase.c @@ -433,12 +433,12 @@ TEST(chase) { r = chase(p, NULL, CHASE_STEP, &result, NULL); assert_se(r == 0); - ASSERT_STREQ("/usr", result); + ASSERT_STREQ(result, "/usr"); result = mfree(result); r = chase("/usr", NULL, CHASE_STEP, &result, NULL); assert_se(r > 0); - ASSERT_STREQ("/usr", result); + ASSERT_STREQ(result, "/usr"); result = mfree(result); /* Make sure that symlinks in the "root" path are not resolved, but those below are */ From 4f9f6a8517e63daa4251470ebffc2e937377027c Mon Sep 17 00:00:00 2001 From: Yu Watanabe Date: Sun, 16 Nov 2025 14:06:24 +0900 Subject: [PATCH 4/4] resolve: voidify one function call Fixes CID#1643235. --- src/resolve/resolved-hook.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/resolve/resolved-hook.c b/src/resolve/resolved-hook.c index fb8342ecd6..6940b7ef14 100644 --- a/src/resolve/resolved-hook.c +++ b/src/resolve/resolved-hook.c @@ -299,7 +299,7 @@ static void hook_recycle_varlink(Hook *h, sd_varlink *vl) { /* Disable any potential callbacks while we are recycling the thing */ sd_varlink_set_userdata(vl, NULL); - sd_varlink_bind_reply(vl, NULL); + (void) sd_varlink_bind_reply(vl, NULL); if (set_size(h->idle_links) > HOOK_IDLE_CONNECTIONS_MAX) return;