network: make check-pointer-deref clean

Add the needed assert changes to make the code clean
for the new check-pointer-deref script.

diff --git a/meson.build b/meson.build
index bb4a2fbeea6a2e422f37be3ab0f94e36f0c62787..674c2fef64f11cfadc2b810c19aeca35fc738b91 100644 (file)
--- a/meson.build
+++ b/meson.build
@@ -2980,7 +2980,6 @@ if spatch.found()
                 'src/basic/',
                 'src/core/',
                 'src/libsystemd/',
-                'src/network/',
                 'src/shared/',
                 # libc/ has no assert() or systemd-headers so leave it
                 'src/libc/',

diff --git a/src/network/generator/network-generator.c b/src/network/generator/network-generator.c
index d0204366fb6abf968e10091acc49424de8dcf4cc..2c3a8bf6aaccf32b10172744cc90e652e00d05e9 100644 (file)
--- a/src/network/generator/network-generator.c
+++ b/src/network/generator/network-generator.c
@@ -119,6 +119,7 @@ static int address_new(
         assert(network);
         assert(IN_SET(family, AF_INET, AF_INET6));
         assert(addr);
+        POINTER_MAY_BE_NULL(peer);
 
         address = new(Address, 1);
         if (!address)

diff --git a/src/network/netdev/macsec.c b/src/network/netdev/macsec.c
index 0b999b4b8a6c078c39215288b9aa9d9da3f9b1f5..9f3ddcc2b193775c4da07dd7f744702acf3c56e7 100644 (file)
--- a/src/network/netdev/macsec.c
+++ b/src/network/netdev/macsec.c
@@ -125,6 +125,7 @@ static int macsec_receive_channel_new(MACsec *s, uint64_t sci, ReceiveChannel **
         ReceiveChannel *c;
 
         assert(s);
+        assert(ret);
 
         c = new(ReceiveChannel, 1);
         if (!c)

diff --git a/src/network/netdev/netdev.c b/src/network/netdev/netdev.c
index 393114aa7bae4491146396bfd9a9c63b7de596a4..bde8d2db05fb39320b62cb2d6a78625a14ec9922 100644 (file)
--- a/src/network/netdev/netdev.c
+++ b/src/network/netdev/netdev.c
@@ -277,6 +277,7 @@ static int netdev_attach_name_full(NetDev *netdev, const char *name, Hashmap **n
 
         assert(netdev);
         assert(name);
+        assert(netdevs);
 
         r = hashmap_ensure_put(netdevs, &string_hash_ops, name, netdev);
         if (r == -ENOMEM)

diff --git a/src/network/networkctl-status-system.c b/src/network/networkctl-status-system.c
index bb1b5d1377bfa5a12e750d2ec29f54bf033fddd2..20a4c2be9186f099324c6d80446843b8b962b351 100644 (file)
--- a/src/network/networkctl-status-system.c
+++ b/src/network/networkctl-status-system.c
@@ -20,6 +20,9 @@ static int ifindex_str_compare_func(char * const *a, char * const *b) {
         size_t al, bl;
         int r;
 
+        assert(a);
+        assert(b);
+
         al = strlen_ptr(*a);
         bl = strlen_ptr(*b);
 

diff --git a/src/network/networkd-dhcp-common.c b/src/network/networkd-dhcp-common.c
index 619c2f6377093cd3bd45654f3adac08f4e09f449..3e7cca991b392d334040bdd0fd0b7c6427f56b3e 100644 (file)
--- a/src/network/networkd-dhcp-common.c
+++ b/src/network/networkd-dhcp-common.c
@@ -276,6 +276,7 @@ int link_get_captive_portal(Link *link, const char **ret) {
         int r;
 
         assert(link);
+        assert(ret);
 
         if (!link->network) {
                 *ret = NULL;

diff --git a/src/network/networkd-dhcp-prefix-delegation.c b/src/network/networkd-dhcp-prefix-delegation.c
index f53d7d1c5aada8da150cbdea3cb990fd2f5f72b0..e734b0171d37ac66b771d221b426c929a7423038 100644 (file)
--- a/src/network/networkd-dhcp-prefix-delegation.c
+++ b/src/network/networkd-dhcp-prefix-delegation.c
@@ -557,6 +557,7 @@ static int dhcp_pd_get_preferred_subnet_prefix(
         assert(link->manager);
         assert(link->network);
         assert(pd_prefix);
+        assert(ret);
 
         if (link->network->dhcp_pd_subnet_id >= 0) {
                 /* If the link has a preference for a particular subnet id try to allocate that */

diff --git a/src/network/networkd-dhcp-server.c b/src/network/networkd-dhcp-server.c
index 24ae1bbe890879f65c2cec522aa9e0889dbc7edb..23ee3024e902ad89a690aced6c00b5ca4547d761 100644 (file)
--- a/src/network/networkd-dhcp-server.c
+++ b/src/network/networkd-dhcp-server.c
@@ -326,6 +326,7 @@ void manager_toggle_dhcp4_server_state(Manager *manager, bool start) {
 
 static int dhcp_server_find_uplink(Link *link, Link **ret) {
         assert(link);
+        assert(ret);
 
         if (link->network->dhcp_server_uplink_name)
                 return link_get_by_name(link->manager, link->network->dhcp_server_uplink_name, ret);

diff --git a/src/network/networkd-link.c b/src/network/networkd-link.c
index 57b074e1be23586d44a90a8708e53b776f982ffb..c6bc8fc4b1c4de1b4c3247ba138f59dbe607b036 100644 (file)
--- a/src/network/networkd-link.c
+++ b/src/network/networkd-link.c
@@ -862,6 +862,7 @@ static int link_put_carrier(Link *link, Link *carrier, Hashmap **h) {
 
         assert(link);
         assert(carrier);
+        assert(h);
 
         if (link == carrier)
                 return 0;

diff --git a/src/network/networkd-radv.c b/src/network/networkd-radv.c
index 0ef292bdf22f724ff2e69988bac237f57b3cf3e3..a71e01dfbf474cee9625b1e0369299f541e3be0d 100644 (file)
--- a/src/network/networkd-radv.c
+++ b/src/network/networkd-radv.c
@@ -423,6 +423,7 @@ static int radv_find_uplink(Link *link, Link **ret) {
         int r;
 
         assert(link);
+        assert(ret);
 
         if (link->network->router_uplink_name)
                 return link_get_by_name(link->manager, link->network->router_uplink_name, ret);

diff --git a/src/network/networkd-routing-policy-rule.c b/src/network/networkd-routing-policy-rule.c
index eb60d315bd200dc6ed5bcc65ecca887004168ecf..1cefad29de50e9c04ea94af89c81151518cd8620 100644 (file)
--- a/src/network/networkd-routing-policy-rule.c
+++ b/src/network/networkd-routing-policy-rule.c
@@ -99,6 +99,8 @@ DEFINE_SECTION_CLEANUP_FUNCTIONS(RoutingPolicyRule, routing_policy_rule_unref);
 static int routing_policy_rule_new(RoutingPolicyRule **ret) {
         RoutingPolicyRule *rule;
 
+        assert(ret);
+
         rule = new(RoutingPolicyRule, 1);
         if (!rule)
                 return -ENOMEM;

diff --git a/src/network/networkd-wwan.c b/src/network/networkd-wwan.c
index b84ace130102aa021dba781465919edfd0173cc6..525660ad8fce6694882e314e00c5cefd151e7ff3 100644 (file)
--- a/src/network/networkd-wwan.c
+++ b/src/network/networkd-wwan.c
@@ -235,6 +235,7 @@ int link_get_modem(Link *link, Modem **ret) {
         assert(link);
         assert(link->manager);
         assert(link->ifname);
+        assert(ret);
 
         HASHMAP_FOREACH(modem, link->manager->modems_by_path)
                 if (modem->port_name && streq(modem->port_name, link->ifname)) {