From fd06f0498f6fcd7f5b0437daee1329fecd822b09 Mon Sep 17 00:00:00 2001 From: Lubomir Rintel Date: Thu, 2 Jul 2015 22:58:12 +0200 Subject: [PATCH] infiniband: don't crash if the parent interface is not yet there Just bail politely just like vlans do. (cherry picked from commit 1a5fec681be4a3a59c0d37b3a5b0d3e1248095ec) --- src/devices/nm-device-infiniband.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/devices/nm-device-infiniband.c b/src/devices/nm-device-infiniband.c index 020dc53346..2e2483c0cf 100644 --- a/src/devices/nm-device-infiniband.c +++ b/src/devices/nm-device-infiniband.c @@ -387,6 +387,9 @@ get_virtual_iface_name (NMDeviceFactory *factory, s_infiniband = nm_connection_get_setting_infiniband (connection); g_assert (s_infiniband); + if (!parent_iface) + return NULL; + g_return_val_if_fail (g_strcmp0 (parent_iface, nm_setting_infiniband_get_parent (s_infiniband)) == 0, NULL); return g_strdup (nm_setting_infiniband_get_virtual_interface_name (s_infiniband));