Commit 10a9109f authored Jul 02, 2012 by Eliad Peller Committed by John W. Linville Jul 09, 2012

mac80211: destroy assoc_data correctly if assoc fails



If association failed due to internal error (e.g. no
supported rates IE), we call ieee80211_destroy_assoc_data()
with assoc=true, while we actually reject the association.

This results in the BSSID not being zeroed out.

After passing assoc=false, we no longer have to call
sta_info_destroy_addr() explicitly. While on it, move
the "associated" message after the assoc_success check.

Cc: stable@vger.kernel.org [3.4+]
Signed-off-by: Eliad Peller <eliad@wizery.com>
Reviewed-by: Johannes Berg <johannes@sipsolutions.net>
Signed-off-by: John W. Linville <linville@tuxdriver.com>

parent 147f20e3

net/mac80211/mlme.c

+2 −4

Original line number	Diff line number	Diff line
		@@ -2174,15 +2174,13 @@ ieee80211_rx_mgmt_assoc_resp(struct ieee80211_sub_if_data *sdata,
		sdata->name, mgmt->sa, status_code);
		ieee80211_destroy_assoc_data(sdata, false);
		} else {
		printk(KERN_DEBUG "%s: associated\n", sdata->name);

		if (!ieee80211_assoc_success(sdata, *bss, mgmt, len)) {
		/* oops -- internal error -- send timeout for now */
		ieee80211_destroy_assoc_data(sdata, true);
		sta_info_destroy_addr(sdata, mgmt->bssid);
		ieee80211_destroy_assoc_data(sdata, false);
		cfg80211_put_bss(*bss);
		return RX_MGMT_CFG80211_ASSOC_TIMEOUT;
		}
		printk(KERN_DEBUG "%s: associated\n", sdata->name);

		/*
		* destroy assoc_data afterwards, as otherwise an idle

Admin message