From 33a44fd7a9d1663378f4a14c074cec8d79b6d92c Mon Sep 17 00:00:00 2001
From: Yu Watanabe <watanabe.yu+github@gmail.com>
Date: Mon, 7 Sep 2026 14:25:03 +0900
Subject: [PATCH] sd-netlink: add missing assertions

(cherry picked from commit d47f1599b8a7a9e4c612bbe4832956501b3e58b7)
---
 .../sd-netlink/netlink-message-nfnl.c         | 20 +++++++++++++++++++
 1 file changed, 20 insertions(+)

diff --git a/src/libsystemd/sd-netlink/netlink-message-nfnl.c b/src/libsystemd/sd-netlink/netlink-message-nfnl.c
index 51983e515e..8ed2d7f037 100644
--- a/src/libsystemd/sd-netlink/netlink-message-nfnl.c
+++ b/src/libsystemd/sd-netlink/netlink-message-nfnl.c
@@ -242,7 +242,11 @@ int sd_nfnl_nft_message_new_basechain(
         _cleanup_(sd_netlink_message_unrefp) sd_netlink_message *m = NULL;
         int r;
 
+        assert(nfnl);
         assert(ret);
+        assert(table);
+        assert(chain);
+        assert(type);
 
         r = sd_nfnl_message_new(nfnl, &m, nfproto, NFNL_SUBSYS_NFTABLES, NFT_MSG_NEWCHAIN, NLM_F_CREATE);
         if (r < 0)
@@ -289,7 +293,9 @@ int sd_nfnl_nft_message_new_table(
         _cleanup_(sd_netlink_message_unrefp) sd_netlink_message *m = NULL;
         int r;
 
+        assert(nfnl);
         assert(ret);
+        assert(table);
 
         r = sd_nfnl_message_new(nfnl, &m, nfproto, NFNL_SUBSYS_NFTABLES, NFT_MSG_NEWTABLE, NLM_F_CREATE | NLM_F_EXCL);
         if (r < 0)
@@ -313,7 +319,10 @@ int sd_nfnl_nft_message_new_rule(
         _cleanup_(sd_netlink_message_unrefp) sd_netlink_message *m = NULL;
         int r;
 
+        assert(nfnl);
         assert(ret);
+        assert(table);
+        assert(chain);
 
         r = sd_nfnl_message_new(nfnl, &m, nfproto, NFNL_SUBSYS_NFTABLES, NFT_MSG_NEWRULE, NLM_F_CREATE);
         if (r < 0)
@@ -343,7 +352,10 @@ int sd_nfnl_nft_message_new_set(
         _cleanup_(sd_netlink_message_unrefp) sd_netlink_message *m = NULL;
         int r;
 
+        assert(nfnl);
         assert(ret);
+        assert(table);
+        assert(set_name);
 
         r = sd_nfnl_message_new(nfnl, &m, nfproto, NFNL_SUBSYS_NFTABLES, NFT_MSG_NEWSET, NLM_F_CREATE);
         if (r < 0)
@@ -380,7 +392,10 @@ int sd_nfnl_nft_message_new_setelems(
         _cleanup_(sd_netlink_message_unrefp) sd_netlink_message *m = NULL;
         int r;
 
+        assert(nfnl);
         assert(ret);
+        assert(table);
+        assert(set_name);
 
         if (add)
                 r = sd_nfnl_message_new(nfnl, &m, nfproto, NFNL_SUBSYS_NFTABLES, NFT_MSG_NEWSETELEM, NLM_F_CREATE);
@@ -412,6 +427,11 @@ int sd_nfnl_nft_message_append_setelem(
 
         int r;
 
+        assert(m);
+        assert(key);
+        assert(key_len > 0);
+        assert(!data || data_len > 0);
+
         r = sd_netlink_message_open_array(m, index);
         if (r < 0)
                 return r;