From c5c49995b10baf043fa57a96c9d8ddf2e99267b4 Mon Sep 17 00:00:00 2001 From: Beniamino Galvani Date: Thu, 20 Feb 2020 14:44:58 +0100 Subject: [PATCH] ovs: fail port enslavement when the bridge device is not found Fail the enslavement of the ovs port if the bridge device is not found, instead of generating assertions and potentially crash later. https://bugzilla.redhat.com/show_bug.cgi?id=1797696 Fixes: 101e65d2bb19 ('ovs: allow changing mac address of bridges and interfaces') --- src/devices/ovs/nm-device-ovs-port.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/devices/ovs/nm-device-ovs-port.c b/src/devices/ovs/nm-device-ovs-port.c index 66a610530..e02163777 100644 --- a/src/devices/ovs/nm-device-ovs-port.c +++ b/src/devices/ovs/nm-device-ovs-port.c @@ -103,6 +103,11 @@ enslave_slave (NMDevice *device, NMDevice *slave, NMConnection *connection, gboo } bridge_device = nm_active_connection_get_device (ac_bridge); + if (!bridge_device) { + _LOGW (LOGD_DEVICE, "can't enslave %s: bridge device not found", + nm_device_get_iface (slave)); + return FALSE; + } nm_ovsdb_add_interface (nm_ovsdb_get (), nm_active_connection_get_applied_connection (ac_bridge),