shaba/systemd
1
0
Fork 0
mirror of https://github.com/systemd/systemd.git synced 2024-12-25 01:34:28 +03:00
Code

networkd: Add check to ensure link is down before attempting to enslave (#5853)

Browse Source 
netdev to bond.

There are situations where a link can be in an "UP" state when
 systemd-networkd attempts to add the link to a bond device.
This is a problem because the bonding driver will refuse to
 enslave a link if it is in the "UP" state.
This check ensures systemd-networkd sets the link to "DOWN"
 before attempting to add the link to the bond.

Fixes #5838.
This commit is contained in:
Roelf Wichertjes 2017-04-30 13:12:32 +02:00 committed by Lennart Poettering
parent 2766d951c9
commit 14b6bb7762
3 changed files with 13 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/network/netdev/netdev.c
View File

@ -28,6 +28,7 @@
#include "network-internal.h" #include "network-internal.h"
#include "netdev/netdev.h" #include "netdev/netdev.h"
#include "networkd-manager.h" #include "networkd-manager.h"
#include "networkd-link.h"
#include "siphash24.h" #include "siphash24.h"
#include "stat-util.h" #include "stat-util.h"
#include "string-table.h" #include "string-table.h"
@ -221,6 +222,13 @@ static int netdev_enslave_ready(NetDev *netdev, Link* link, sd_netlink_message_h
assert(link); assert(link);
assert(callback); assert(callback);
if (link->flags & IFF_UP) {
log_netdev_debug(netdev, "Link '%s' was up when attempting to enslave it. Bringing link down.", link->ifname);
r = link_down(link);
if (r < 0)
return log_netdev_error_errno(netdev, r, "Could not bring link down: %m");
}
r = sd_rtnl_message_new_link(netdev->manager->rtnl, &req, RTM_SETLINK, link->ifindex); r = sd_rtnl_message_new_link(netdev->manager->rtnl, &req, RTM_SETLINK, link->ifindex);
if (r < 0) if (r < 0)
return log_netdev_error_errno(netdev, r, "Could not allocate RTM_SETLINK message: %m"); return log_netdev_error_errno(netdev, r, "Could not allocate RTM_SETLINK message: %m");

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

@ -1644,7 +1644,7 @@ static int link_up_handler(sd_netlink *rtnl, sd_netlink_message *m, void *userda
return 1; return 1;
} }
static int link_up(Link *link) { int link_up(Link *link) {
_cleanup_(sd_netlink_message_unrefp) sd_netlink_message *req = NULL; _cleanup_(sd_netlink_message_unrefp) sd_netlink_message *req = NULL;
uint8_t ipv6ll_mode; uint8_t ipv6ll_mode;
int r; int r;
@ -1765,7 +1765,7 @@ static int link_down_handler(sd_netlink *rtnl, sd_netlink_message *m, void *user
return 1; return 1;
} }
static int link_down(Link *link) { int link_down(Link *link) {
_cleanup_(sd_netlink_message_unrefp) sd_netlink_message *req = NULL; _cleanup_(sd_netlink_message_unrefp) sd_netlink_message *req = NULL;
int r; int r;

3
src/network/networkd-link.h
View File

@ -140,6 +140,9 @@ int link_get(Manager *m, int ifindex, Link **ret);
int link_add(Manager *manager, sd_netlink_message *message, Link **ret); int link_add(Manager *manager, sd_netlink_message *message, Link **ret);
void link_drop(Link *link); void link_drop(Link *link);
int link_up(Link *link);
int link_down(Link *link);
int link_address_remove_handler(sd_netlink *rtnl, sd_netlink_message *m, void *userdata); int link_address_remove_handler(sd_netlink *rtnl, sd_netlink_message *m, void *userdata);
int link_route_remove_handler(sd_netlink *rtnl, sd_netlink_message *m, void *userdata); int link_route_remove_handler(sd_netlink *rtnl, sd_netlink_message *m, void *userdata);