From: Yu Watanabe <watanabe.yu+github@gmail.com>
Date: Fri, 8 Nov 2024 11:38:42 +0000 (+0900)
Subject: netwrok: call link_drop_unmanaged_config() earlier in link_configure()
X-Git-Tag: v257-rc2~41^2~7
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ed3bab7a0e9097e443599297bf5a916315a8d574;p=thirdparty%2Fsystemd.git

netwrok: call link_drop_unmanaged_config() earlier in link_configure()

Otherwise, even if a link enters the configuring state at the beginning
of link_configure(), link_check_ready() may be called before
link_drop_unmanaged_config() is called, and the link may enter the
configured state.

Fixes #35092.
---

diff --git a/src/network/networkd-link.c b/src/network/networkd-link.c
index 080e6beff3b..ab74260adbe 100644
--- a/src/network/networkd-link.c
+++ b/src/network/networkd-link.c
@@ -1148,6 +1148,10 @@ static int link_configure(Link *link) {
 
         link_set_state(link, LINK_STATE_CONFIGURING);
 
+        r = link_drop_unmanaged_config(link);
+        if (r < 0)
+                return r;
+
         r = link_new_bound_to_list(link);
         if (r < 0)
                 return r;
@@ -1253,10 +1257,6 @@ static int link_configure(Link *link) {
         if (r < 0)
                 return r;
 
-        r = link_drop_unmanaged_config(link);
-        if (r < 0)
-                return r;
-
         r = link_request_static_configs(link);
         if (r < 0)
                 return r;