aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPaul Stewart <pstew@chromium.org>2012-08-04 17:10:08 (GMT)
committerJouni Malinen <j@w1.fi>2012-08-04 17:10:08 (GMT)
commit21270bb4b3b40750190aea6aec5933c45fd40643 (patch)
tree4ba9b4099d0c5462af57c5890cfcb7e6f4dcfbd6
parent02af9c90fb8589f78ebed43a6f8f58777deaa412 (diff)
downloadhostap-21270bb4b3b40750190aea6aec5933c45fd40643.zip
hostap-21270bb4b3b40750190aea6aec5933c45fd40643.tar.gz
hostap-21270bb4b3b40750190aea6aec5933c45fd40643.tar.bz2
Fix a couple memory leaks
Found using valgrind. Signed-hostap: Paul Stewart <pstew@chromium.org>
-rw-r--r--src/drivers/driver_nl80211.c5
-rw-r--r--wpa_supplicant/dbus/dbus_new_handlers.c1
2 files changed, 5 insertions, 1 deletions
diff --git a/src/drivers/driver_nl80211.c b/src/drivers/driver_nl80211.c
index 8b0a5f7..36cdbc8 100644
--- a/src/drivers/driver_nl80211.c
+++ b/src/drivers/driver_nl80211.c
@@ -8465,12 +8465,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;