network: fix potential memleaks related to set_put()

diff --git a/src/network/networkd-address.c b/src/network/networkd-address.c
index a207bb07901df5dc01be861690ac35efcbd8baaf..e6f30a28423d36643428963018e089352803a49c 100644 (file)
--- a/src/network/networkd-address.c
+++ b/src/network/networkd-address.c
@@ -260,6 +260,8 @@ static int address_add_internal(Link *link, Set **addresses,
         r = set_put(*addresses, address);
         if (r < 0)
                 return r;
+        if (r == 0)
+                return -EEXIST;
 
         address->link = link;
 

diff --git a/src/network/networkd-link.c b/src/network/networkd-link.c
index 5c0149492f0867e7805f3d43e52046ac6b704e4a..6bcb07880896e6eae1104913697cea06a22991a8 100644 (file)
--- a/src/network/networkd-link.c
+++ b/src/network/networkd-link.c
@@ -1945,6 +1945,8 @@ static int link_append_to_master(Link *link, NetDev *netdev) {
         r = set_put(master->slaves, link);
         if (r < 0)
                 return r;
+        if (r == 0)
+                return 0;
 
         link_ref(link);
         return 0;

diff --git a/src/network/networkd-route.c b/src/network/networkd-route.c
index 8cc8080b46521f884a72da8d9f3b6922e9237c60..8a16e9111ff026e648374738ff63c570f0a7d13c 100644 (file)
--- a/src/network/networkd-route.c
+++ b/src/network/networkd-route.c
@@ -399,6 +399,8 @@ static int route_add_internal(
         r = set_put(*routes, route);
         if (r < 0)
                 return r;
+        if (r == 0)
+                return -EEXIST;
 
         route->link = link;
 

diff --git a/src/network/networkd-routing-policy-rule.c b/src/network/networkd-routing-policy-rule.c
index 31a49ed905f2bee6e99fc980fd8d49ab87320f27..1864a5a376d46f3a199a35082825eed48d559706 100644 (file)
--- a/src/network/networkd-routing-policy-rule.c
+++ b/src/network/networkd-routing-policy-rule.c
@@ -209,7 +209,11 @@ int routing_policy_rule_make_local(Manager *m, RoutingPolicyRule *rule) {
                 if (r < 0)
                         return r;
 
-                return set_put(m->rules, rule);
+                r = set_put(m->rules, rule);
+                if (r < 0)
+                        return r;
+                if (r == 0)
+                        routing_policy_rule_free(rule);
         }
 
         return -ENOENT;
@@ -265,6 +269,8 @@ static int routing_policy_rule_add_internal(Manager *m, Set **rules, RoutingPoli
         r = set_put(*rules, rule);
         if (r < 0)
                 return r;
+        if (r == 0)
+                return -EEXIST;
 
         if (ret)
                 *ret = rule;
@@ -1180,8 +1186,8 @@ int routing_policy_load_rules(const char *state_file, Set **rules) {
                         log_warning_errno(r, "Failed to add RPDB rule to saved DB, ignoring: %s", p);
                         continue;
                 }
-
-                rule = NULL;
+                if (r > 0)
+                        rule = NULL;
         }
 
         return 0;