Patchwork [PATCHv3] Fix a couple memory leaks

login
register
mail settings
Submitter Paul Stewart
Date June 7, 2012, 2 a.m.
Message ID <20120713183314.1C7B8205FD@glenhelen.mtv.corp.google.com>
Download mbox | patch
Permalink /patch/170945/
State Accepted
Commit 21270bb4b3b40750190aea6aec5933c45fd40643
Headers show

Comments

Paul Stewart - June 7, 2012, 2 a.m.
Found using valgrind.

Signed-hostap: Paul Stewart <pstew@chromium.org>
---

Whups.  I already sent a v2.  Should have named this v3.

 src/drivers/driver_nl80211.c            |    5 ++++-
 wpa_supplicant/dbus/dbus_new_handlers.c |    1 +
 2 files changed, 5 insertions(+), 1 deletions(-)
Jouni Malinen - Aug. 4, 2012, 5:11 p.m.
Thanks, applied.

Patch

diff --git a/src/drivers/driver_nl80211.c b/src/drivers/driver_nl80211.c
index 0373f43..75cd669 100644
--- a/src/drivers/driver_nl80211.c
+++ b/src/drivers/driver_nl80211.c
@@ -8444,12 +8444,15 @@  static int nl80211_signal_monitor(void *priv, int threshold, int hysteresis)
 
 	cqm = nlmsg_alloc();
 	if (cqm == NULL)
-		return -1;
+		goto nla_put_failure;
 
 	NLA_PUT_U32(cqm, NL80211_ATTR_CQM_RSSI_THOLD, threshold);
 	NLA_PUT_U32(cqm, NL80211_ATTR_CQM_RSSI_HYST, hysteresis);
 	nla_put_nested(msg, NL80211_ATTR_CQM, cqm);
 
+	nlmsg_free(cqm);
+	cqm = NULL;
+
 	if (send_and_recv_msgs(drv, msg, NULL, NULL) == 0)
 		return 0;
 	msg = NULL;
diff --git a/wpa_supplicant/dbus/dbus_new_handlers.c b/wpa_supplicant/dbus/dbus_new_handlers.c
index 8145a70..3f895cf 100644
--- a/wpa_supplicant/dbus/dbus_new_handlers.c
+++ b/wpa_supplicant/dbus/dbus_new_handlers.c
@@ -609,6 +609,7 @@  DBusMessage * wpas_dbus_handler_create_interface(DBusMessage *message,
 out:
 	os_free(driver);
 	os_free(ifname);
+	os_free(confname);
 	os_free(bridge_ifname);
 	return reply;