fdo-mirrors/NetworkManager
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/NetworkManager/NetworkManager.git synced 2026-01-05 05:40:15 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

ovs: avoid race condition when system interface is removed from ovsdb

Browse source 
Failing the system interface device is almost always the right thing
to do when the ovsdb entry is removed.

However, to avoid that a late device-removed signal tears down a
different, newly-activated connection, let's also check that we have a
master.  Or in alternative, that the device is assumed/external: in
such case it's always fine to fail the device

Fixes: 8e55efeb9d ('ovs: fail OVS system interfaces when the db entry gets removed')

https://bugzilla.redhat.com/show_bug.cgi?id=1923248
https://gitlab.freedesktop.org/NetworkManager/NetworkManager/-/merge_requests/741
This commit is contained in:
Beniamino Galvani 2021-02-02 16:21:58 +01:00
parent cbb59e3308
commit a980d9916d
1 changed files with 10 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/core/devices/ovs/nm-ovs-factory.c
View file

@ -165,6 +165,16 @@ ovsdb_device_removed(NMOvsdb * ovsdb,
continue;
if (!nm_streq0(nm_setting_ovs_interface_get_interface_type(s_ovs_int), "system"))
continue;
/* Failing the system interface device is almost always the right
* thing to do when the ovsdb entry is removed. However, to avoid
* that a late device-removed signal tears down a different,
* newly-activated connection, let's also check that we have a master.
* Or in alternative, that the device is assumed/external: in such
* case it's always fine to fail the device.
*/
if (!nm_device_get_master(d) && !nm_device_sys_iface_state_is_external_or_assume(d))
continue;
device = d;
}
} else {