From 43cb578dfe2c492257636f6234a24178ed27789e Mon Sep 17 00:00:00 2001 From: Dmitry Shmidt Date: Mon, 16 Jun 2014 16:23:22 -0700 Subject: Cumulative patch from commit 7efc7f66b1d63b3bbb99d9176f6f68c4d1fc6327 7efc7f6 TDLS: Fix TPK M1 error case (CID 68214) d1bb7ae nl80211: Fix non-hostapd interface addition to not call add_ifidx() 38ddcca TDLS: Add ctrl_iface option for flushing all TDLS peers 342bce6 TDLS: Bail on STA add failure in tpk_m1 processing 947f900 TDLS: Handle unreachable link teardown for external setup cf1600a hostapd: Configure driver ACL even if MAC address list is empty fa21e6c Fix CONFIG_MODULE_TESTS=y build without CONFIG_P2P=y bd10d93 P2P: Clean up by moving ifdef CONFIG_P2P to p2p_suppplicant.h e3bd6e9 P2P: Use another interface operating channel as listen channel 28812a8 P2P: Try using one of the social channels for GO 751b00b P2P: Modify p2p_get_pref_freq 0a816e8 P2P: Remove duplicated code from get_shared_radio_freqs_data() 504df28 Remove unused dump_freq_array() a0c90bb P2P: Collect and use extended data on used frequencies b278f32 P2P: Remove unused code from get_shared_radio_freqs_data() e627012 Clean up EAPOL-Key Key Data processing d56d7e5 Clean up EAPOL-Key processing 8605eab EAP-EKE: Fix typos in debug message 25be28a dbus: Check return value more consistently (CID 62841) ac79fcf wext: Verify set_ssid results consistently (CID 62842) f62415d Note chmod() failure in debug log even in ignore case (CID 62843) 305000e WPS: Check wps_build_wfa_ext() return value consistently (CID 68104) 2485835 EAP-MSCHAPv2: Check hash function results more consistently (CID 68105) b7c61c9 Fix validation of EAPOL-Key length with AES key wrap (CID 62859) Change-Id: I4da11c59a54467301c38c3bec52629b9db19647d Signed-off-by: Dmitry Shmidt --- src/wps/wps_upnp.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'src/wps') diff --git a/src/wps/wps_upnp.c b/src/wps/wps_upnp.c index f62b49e6..ae94a9f6 100644 --- a/src/wps/wps_upnp.c +++ b/src/wps/wps_upnp.c @@ -596,7 +596,10 @@ static struct wpabuf * build_fake_wsc_ack(void) wpabuf_put_be16(msg, ATTR_REGISTRAR_NONCE); wpabuf_put_be16(msg, WPS_NONCE_LEN); wpabuf_put(msg, WPS_NONCE_LEN); - wps_build_wfa_ext(msg, 0, NULL, 0); + if (wps_build_wfa_ext(msg, 0, NULL, 0)) { + wpabuf_free(msg); + return NULL; + } return msg; } -- cgit v1.2.3