From cc41c084cdd1eadf82918448bc339e67511f95d2 Mon Sep 17 00:00:00 2001 From: Yu Watanabe Date: Fri, 15 Apr 2022 17:37:52 +0900 Subject: [PATCH 1/2] sd-netlink: use correct type of iterator --- src/libsystemd/sd-netlink/sd-netlink.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/libsystemd/sd-netlink/sd-netlink.c b/src/libsystemd/sd-netlink/sd-netlink.c index 5271c1492d..e23e2cc163 100644 --- a/src/libsystemd/sd-netlink/sd-netlink.c +++ b/src/libsystemd/sd-netlink/sd-netlink.c @@ -270,7 +270,7 @@ int sd_netlink_sendv( return -ENOMEM; } - for (unsigned i = 0; i < msgcount; i++) { + for (size_t i = 0; i < msgcount; i++) { assert_return(!messages[i]->sealed, -EPERM); netlink_seal_message(nl, messages[i]); From 012f32d808cf0c5b4977f1f295aa431097075e01 Mon Sep 17 00:00:00 2001 From: Yu Watanabe Date: Fri, 15 Apr 2022 17:38:31 +0900 Subject: [PATCH 2/2] firewall-util: inline iterator and add several missing assertions --- src/shared/firewall-util-nft.c | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/src/shared/firewall-util-nft.c b/src/shared/firewall-util-nft.c index d6beaf20d8..1970834878 100644 --- a/src/shared/firewall-util-nft.c +++ b/src/shared/firewall-util-nft.c @@ -29,13 +29,16 @@ #define UDP_DPORT_OFFSET 2 -static int nfnl_netlink_sendv(sd_netlink *nfnl, - sd_netlink_message *messages[], - size_t msgcount) { +static int nfnl_netlink_sendv( + sd_netlink *nfnl, + sd_netlink_message **messages, + size_t msgcount) { + _cleanup_free_ uint32_t *serial = NULL; - size_t i; int r; + assert(nfnl); + assert(messages); assert(msgcount > 0); r = sd_netlink_sendv(nfnl, messages, msgcount, &serial); @@ -43,7 +46,7 @@ static int nfnl_netlink_sendv(sd_netlink *nfnl, return r; r = 0; - for (i = 1; i < msgcount - 1; i++) { + for (size_t i = 1; i < msgcount - 1; i++) { int tmp; /* If message is an error, this returns embedded errno */