From: Yu Watanabe <watanabe.yu+github@gmail.com>
Date: Mon, 16 Jan 2023 13:07:06 +0000 (+0900)
Subject: network: fix memleak
X-Git-Tag: v253-rc1~99
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=303dfa73b389e8f6dc58954e867c21724c1446f7;p=thirdparty%2Fsystemd.git

network: fix memleak

Fixes a bug introduced by af2aea8bb64b0dc42ecbe5549216eb567681a803.

Fixes #25883 and #25891.
---

diff --git a/src/network/networkd-address.c b/src/network/networkd-address.c
index 5b3b7d128aa..c691a5e0575 100644
--- a/src/network/networkd-address.c
+++ b/src/network/networkd-address.c
@@ -1216,9 +1216,13 @@ int link_request_address(
 
         (void) address_get(link, address, &existing);
 
-        if (address->lifetime_valid_usec == 0)
+        if (address->lifetime_valid_usec == 0) {
+                if (consume_object)
+                        address_free(address);
+
                 /* The requested address is outdated. Let's remove it. */
                 return address_remove_and_drop(existing);
+        }
 
         if (!existing) {
                 _cleanup_(address_freep) Address *tmp = NULL;
diff --git a/src/network/networkd-route.c b/src/network/networkd-route.c
index d1f3bab0922..5214a8ad2c9 100644
--- a/src/network/networkd-route.c
+++ b/src/network/networkd-route.c
@@ -1437,9 +1437,13 @@ int link_request_route(
 
         (void) route_get(link->manager, link, route, &existing);
 
-        if (route->lifetime_usec == 0)
+        if (route->lifetime_usec == 0) {
+                if (consume_object)
+                        route_free(route);
+
                 /* The requested route is outdated. Let's remove it. */
                 return route_remove_and_drop(existing);
+        }
 
         if (!existing) {
                 _cleanup_(route_freep) Route *tmp = NULL;