From: Yu Watanabe <watanabe.yu+github@gmail.com>
Date: Sat, 27 Nov 2021 12:01:27 +0000 (+0900)
Subject: network: route: route->link may be NULL
X-Git-Tag: v250-rc1~132
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=70b06526971e59a6fd5020dee0425ed88af7c6f9;p=thirdparty%2Fsystemd.git

network: route: route->link may be NULL

Fixes #21544.
---

diff --git a/src/network/networkd-route.c b/src/network/networkd-route.c
index 1b3bea98f6d..623b962c232 100644
--- a/src/network/networkd-route.c
+++ b/src/network/networkd-route.c
@@ -981,15 +981,19 @@ void link_foreignize_routes(Link *link) {
 
 static int route_expire_handler(sd_event_source *s, uint64_t usec, void *userdata) {
         Route *route = userdata;
+        Link *link;
         int r;
 
         assert(route);
-        assert(route->link);
+        assert(route->manager || (route->link && route->link->manager));
+
+        link = route->link; /* This may be NULL. */
 
         r = route_remove(route);
         if (r < 0) {
-                log_link_warning_errno(route->link, r, "Could not remove route: %m");
-                link_enter_failed(route->link);
+                log_link_warning_errno(link, r, "Could not remove route: %m");
+                if (link)
+                        link_enter_failed(link);
         }
 
         return 1;