From 3c6d5ac3d7a9f83031ae468fcc5eec6686c516de Mon Sep 17 00:00:00 2001 From: Jasper Lievisse Adriaanse Date: Tue, 7 Feb 2017 19:23:53 +0100 Subject: Plug an fd leak in the OpenBSD-specific code for _first_ --- src/first_network_device.c | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) (limited to 'src') diff --git a/src/first_network_device.c b/src/first_network_device.c index 4e68006..5932385 100644 --- a/src/first_network_device.c +++ b/src/first_network_device.c @@ -94,18 +94,21 @@ static net_type_t iface_type(const char *ifname) { strlcpy(bssid.i_name, ifname, sizeof(bssid.i_name)); ibssid = ioctl(s, SIOCG80211BSSID, &bssid); - if (ibssid == 0 || inwid == 0) + if (ibssid == 0 || inwid == 0) { + close(s); return NET_TYPE_WIRELESS; + } (void)memset(&ifmr, 0, sizeof(ifmr)); (void)strlcpy(ifmr.ifm_name, ifname, sizeof(ifmr.ifm_name)); - if (ioctl(s, SIOCGIFMEDIA, (caddr_t)&ifmr) < 0) + if (ioctl(s, SIOCGIFMEDIA, (caddr_t)&ifmr) < 0) { + close(s); return NET_TYPE_OTHER; - else + } else { + close(s); return NET_TYPE_ETHERNET; - - close(s); + } #else #error Missing implementation to determine interface type. #endif -- cgit v1.2.3