diff options
| author | Thomas Haller <thaller@redhat.com> | 2016-12-12 14:06:44 +0100 |
|---|---|---|
| committer | Thomas Haller <thaller@redhat.com> | 2016-12-12 21:46:27 +0100 |
| commit | 7eaa35b0c2d72be8927d26d5ec668a4a0588d09a (patch) | |
| tree | c9ffdbaae8a99253b5ec714ed58a4dcd2acb3e28 | |
| parent | f95042e4e544bd968f3eee35da41908048fa2be8 (diff) | |
| download | NetworkManager-th/sysctl-ifname-race-bgo775613.tar.gz | |
platform: assume ifname is present in _linktype_get_type()th/sysctl-ifname-race-bgo775613
_linktype_get_type() only has one caller, and ifname is *never*
NULL.
| -rw-r--r-- | src/platform/nm-linux-platform.c | 16 |
1 files changed, 10 insertions, 6 deletions
diff --git a/src/platform/nm-linux-platform.c b/src/platform/nm-linux-platform.c index e491a85639..7a7947c6d7 100644 --- a/src/platform/nm-linux-platform.c +++ b/src/platform/nm-linux-platform.c @@ -611,6 +611,7 @@ _linktype_get_type (NMPlatform *platform, guint i; ASSERT_NETNS_CURRENT (platform); + nm_assert (ifname); if (completed_from_cache) { const NMPObject *obj; @@ -631,7 +632,7 @@ _linktype_get_type (NMPlatform *platform, * of messing stuff up. */ if ( obj && !NM_IN_SET (obj->link.type, NM_LINK_TYPE_UNKNOWN, NM_LINK_TYPE_NONE) - && !g_strcmp0 (ifname, obj->link.name) + && nm_streq (ifname, obj->link.name) && ( !kind || !g_strcmp0 (kind, obj->link.kind))) { nm_assert (obj->link.kind == g_intern_string (obj->link.kind)); @@ -652,7 +653,7 @@ _linktype_get_type (NMPlatform *platform, NMPlatformTunProperties props; if ( platform - && nm_platform_link_tun_get_properties (platform, ifindex, ifname ?: "", &props)) { + && nm_platform_link_tun_get_properties (platform, ifindex, ifname, &props)) { if (!g_strcmp0 (props.mode, "tap")) return NM_LINK_TYPE_TAP; if (!g_strcmp0 (props.mode, "tun")) @@ -675,11 +676,8 @@ _linktype_get_type (NMPlatform *platform, else if (arptype == ARPHRD_TUNNEL6) return NM_LINK_TYPE_IP6TNL; - if (ifname) { + { NMPUtilsEthtoolDriverInfo driver_info; - nm_auto_close int dirfd = -1; - gs_free char *devtype = NULL; - char ifname_verified[IFNAMSIZ]; /* Fallback OVS detection for kernel <= 3.16 */ if (nmp_utils_ethtool_get_driver_info (ifindex, &driver_info)) { @@ -694,6 +692,12 @@ _linktype_get_type (NMPlatform *platform, return NM_LINK_TYPE_ETHERNET; } } + } + + { + nm_auto_close int dirfd = -1; + gs_free char *devtype = NULL; + char ifname_verified[IFNAMSIZ]; dirfd = nmp_utils_sysctl_open_netdir (ifindex, ifname, ifname_verified); if (dirfd >= 0) { |