morgan/systemd
1
0
Fork 0
mirror of https://github.com/morgan9e/systemd synced 2026-04-14 00:14:32 +09:00
Code Issues Packages Projects Releases Wiki Activity

network: fix handling of ENODATA when reading IFLA_MASTER attribute (#37633)

Browse Source 
Fixes #37629.
This commit is contained in:
Luca Boccassi
2025-05-28 12:20:00 +01:00
committed by GitHub
parent d117687ab3 ff6f0a58c5
commit 5a01c7c5f4
2 changed files with 22 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -2205,8 +2205,8 @@ static int link_update_master(Link *link, sd_netlink_message *message) {
r = sd_netlink_message_read_u32(message, IFLA_MASTER, (uint32_t*) &master_ifindex);
if (r == -ENODATA)
return 0;
if (r < 0)
master_ifindex = 0; /* no master interface */
else if (r < 0)
return log_link_debug_errno(link, r, "rtnl: failed to read master ifindex: %m");
if (master_ifindex == link->ifindex)
@@ -2223,6 +2223,9 @@ static int link_update_master(Link *link, sd_netlink_message *message) {
link_drop_from_master(link);
link->master_ifindex = master_ifindex;
/* Updating master ifindex may cause operational state change, e.g. carrier <-> enslaved */
link_dirty(link);
}
r = link_append_to_master(link);

19
test/test-network/systemd-networkd-tests.py
View File

@@ -5104,11 +5104,11 @@ class NetworkdNetworkTests(unittest.TestCase, Utilities):
output = check_output('ip -4 addr show dev dummy98')
print(output)
self.assertRegex(output, 'inet 10\.234\.77\.111/32.*dummy98')
self.assertIn('inet 10.234.77.111/32', output)
output = check_output('ip -6 addr show dev dummy98')
print(output)
self.assertRegex(output, 'inet6 2222:3333::4444/64 scope global')
self.assertIn('inet6 2222:3333::4444/64 scope global', output)
def check_nexthop(self, manage_foreign_nexthops, first):
self.wait_online('veth99:routable', 'veth-peer:routable', 'dummy98:routable')
@@ -5775,6 +5775,21 @@ class NetworkdBondTests(unittest.TestCase, Utilities):
print(output)
self.assertRegex(output, 'master bond199')
# Test case for #37629
for _ in range(3):
# When a slave leaved from its master bonding interface, the kernel brings down the slave.
check_output('ip link set dummy98 nomaster')
self.wait_online('dummy98:off')
# Bring up the interface to check if networkd recognizes the interface has no master now.
check_output('ip link set dummy98 up')
self.wait_online('dummy98:carrier')
# We need to first bring down the interface to make it join a bonding interface.
check_output('ip link set dummy98 down')
check_output('ip link set dummy98 master bond199')
self.wait_online('dummy98:enslaved')
def test_bond_active_slave(self):
copy_network_unit('23-active-slave.network', '23-bond199.network', '25-bond-active-backup-slave.netdev', '12-dummy.netdev')
start_networkd()