picnoir
/
Systemd
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #17935 from yuwata/network-fix-another-race-in-link-reconfigure-17929 

network: do not reconfigure interface when the link gains carrier but udev not initialized it yet
This commit is contained in:
Zbigniew Jędrzejewski-Szmek 2020-12-11 11:39:44 +01:00 committed by GitHub
parent 239952e890 f8dd40779a
commit 5916c54a8d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 22 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/network/networkd-link-bus.c
View File

@ -667,11 +667,12 @@ int bus_link_method_reconfigure(sd_bus_message *message, void *userdata, sd_bus_
r = link_reconfigure(l, true);
if (r < 0)
return r;
link_set_state(l, LINK_STATE_INITIALIZED);
r = link_save_and_clean(l);
if (r < 0)
return r;
if (r > 0) {
link_set_state(l, LINK_STATE_INITIALIZED);
r = link_save_and_clean(l);
if (r < 0)
return r;
}
return sd_bus_reply_method_return(message, NULL);
}

30
src/network/networkd-link.c
View File

@ -2118,22 +2118,21 @@ static int link_configure_continue(Link *link) {
}
static int link_reconfigure_internal(Link *link, sd_netlink_message *m, bool force) {
_cleanup_strv_free_ char **s = NULL;
Network *network;
int r;
if (m) {
_cleanup_strv_free_ char **s = NULL;
assert(m);
r = sd_netlink_message_get_errno(m);
if (r < 0)
return r;
r = sd_netlink_message_get_errno(m);
if (r < 0)
return r;
r = sd_netlink_message_read_strv(m, IFLA_PROP_LIST, IFLA_ALT_IFNAME, &s);
if (r < 0 && r != -ENODATA)
return r;
r = sd_netlink_message_read_strv(m, IFLA_PROP_LIST, IFLA_ALT_IFNAME, &s);
if (r < 0 && r != -ENODATA)
return r;
strv_free_and_replace(link->alternative_names, s);
}
strv_free_and_replace(link->alternative_names, s);
r = network_get(link->manager, link->iftype, link->sd_device,
link->ifname, link->alternative_names, link->driver,
@ -2223,8 +2222,11 @@ int link_reconfigure(Link *link, bool force) {
_cleanup_(sd_netlink_message_unrefp) sd_netlink_message *req = NULL;
int r;
if (IN_SET(link->state, LINK_STATE_PENDING, LINK_STATE_LINGER))
return 0;
/* When link in pending or initialized state, then link_configure() will be called. To prevent
* the function from being called multiple times simultaneously, refuse to reconfigure the
* interface in these cases. */
if (IN_SET(link->state, LINK_STATE_PENDING, LINK_STATE_INITIALIZED, LINK_STATE_LINGER))
return 0; /* 0 means no-op. */
r = sd_rtnl_message_new_link(link->manager->rtnl, &req, RTM_GETLINK,
link->ifindex);
@ -2239,7 +2241,7 @@ int link_reconfigure(Link *link, bool force) {
link_ref(link);
return 0;
return 1; /* 1 means the interface will be reconfigured. */
}
static int link_initialized_and_synced(Link *link) {
@ -2476,7 +2478,7 @@ static int link_carrier_gained(Link *link) {
if (r < 0)
return r;
if (r > 0) {
r = link_reconfigure_internal(link, NULL, false);
r = link_reconfigure(link, false);
if (r < 0) {
link_enter_failed(link);
return r;