From 89ff57baf61ebf18166c82db71789227ac8f9b2b Mon Sep 17 00:00:00 2001 From: Robert Love Date: Tue, 10 Jan 2006 21:36:31 +0000 Subject: [PATCH] 2006-01-10 Robert Love * src/nm-device-802-11-wireless.c, src/nm-device-802-3-ethernet.c: Make sure that we close the socket! git-svn-id: http://svn-archive.gnome.org/svn/NetworkManager/trunk@1310 4912f4e0-d625-0410-9fb7-b9a5a253dbdc --- ChangeLog | 5 +++++ src/nm-device-802-11-wireless.c | 5 ++++- src/nm-device-802-3-ethernet.c | 5 ++++- 3 files changed, 13 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 8b031158c9..ddfa9cc199 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2006-01-10 Robert Love + + * src/nm-device-802-11-wireless.c, src/nm-device-802-3-ethernet.c: Make + sure that we close the socket! + 2006-01-10 Robert Love * src/nm-device-802-11-wireless.c, src/nm-device-802-11-wireless.h, diff --git a/src/nm-device-802-11-wireless.c b/src/nm-device-802-11-wireless.c index c39f9e55f9..17a2bf5577 100644 --- a/src/nm-device-802-11-wireless.c +++ b/src/nm-device-802-11-wireless.c @@ -450,9 +450,12 @@ nm_device_802_11_wireless_set_address (NMDevice80211Wireless *self) ret = ioctl (nm_dev_sock_get_fd (sk), SIOCGIFHWADDR, &req); if (ret) - return; + goto out; memcpy (&(self->priv->hw_addr), &(req.ifr_hwaddr.sa_data), sizeof (struct ether_addr)); + +out: + nm_dev_sock_close (sk); } diff --git a/src/nm-device-802-3-ethernet.c b/src/nm-device-802-3-ethernet.c index e37cda543a..39abc72812 100644 --- a/src/nm-device-802-3-ethernet.c +++ b/src/nm-device-802-3-ethernet.c @@ -173,9 +173,12 @@ nm_device_802_3_ethernet_set_address (NMDevice8023Ethernet *self) ret = ioctl (nm_dev_sock_get_fd (sk), SIOCGIFHWADDR, &req); if (ret) - return; + goto out; memcpy (&(self->priv->hw_addr), &(req.ifr_hwaddr.sa_data), sizeof (struct ether_addr)); + +out: + nm_dev_sock_close (sk); }