From: Yu Watanabe <watanabe.yu+github@gmail.com>
Date: Sat, 11 Dec 2021 17:52:09 +0000 (+0900)
Subject: network: route: link_drop_foreign_routes() must be called only for managed interfaces
X-Git-Tag: v250-rc3~33^2~1
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=8a20a8438f57f9301e0c4ddccf2d13cd8fd9a8b2;p=thirdparty%2Fsystemd.git

network: route: link_drop_foreign_routes() must be called only for managed interfaces
---

diff --git a/src/network/networkd-route.c b/src/network/networkd-route.c
index bfd849abb96..156476066a3 100644
--- a/src/network/networkd-route.c
+++ b/src/network/networkd-route.c
@@ -893,6 +893,7 @@ int link_drop_foreign_routes(Link *link) {
 
         assert(link);
         assert(link->manager);
+        assert(link->network);
 
         SET_FOREACH(route, link->routes) {
                 /* do not touch routes managed by the kernel */
@@ -907,11 +908,11 @@ int link_drop_foreign_routes(Link *link) {
                 if (!route_exists(route))
                         continue;
 
-                if (route->protocol == RTPROT_STATIC && link->network &&
+                if (route->protocol == RTPROT_STATIC &&
                     FLAGS_SET(link->network->keep_configuration, KEEP_CONFIGURATION_STATIC))
                         continue;
 
-                if (route->protocol == RTPROT_DHCP && link->network &&
+                if (route->protocol == RTPROT_DHCP &&
                     FLAGS_SET(link->network->keep_configuration, KEEP_CONFIGURATION_DHCP))
                         continue;