mac80211: fix race condition caused by late addBA response (d305a655) · Commits · 戴 / test

If addBA responses comes in just after addba_resp_timer has expired mac80211 will still accept it and try to open the aggregation session. This causes drivers to be confused and in some cases even crash. This patch fixes the race condition and makes sure that if addba_resp_timer has expired addBA response is not longer accepted and we do not try to open half-closed session. Cc: stable@vger.kernel.org Signed-off-by:

Nikolay Martynov <mar.kolya@gmail.com> [some adjustments] Signed-off-by:

Johannes Berg <johannes.berg@intel.com> Signed-off-by:

John W. Linville <linville@tuxdriver.com>

net/mac80211/agg-tx.c

+17 −1

Original line number	Diff line number	Diff line
		@@ -762,11 +762,27 @@ void ieee80211_process_addba_resp(struct ieee80211_local *local,
		goto out;
		}

		del_timer(&tid_tx->addba_resp_timer);
		del_timer_sync(&tid_tx->addba_resp_timer);

		#ifdef CONFIG_MAC80211_HT_DEBUG
		printk(KERN_DEBUG "switched off addBA timer for tid %d\n", tid);
		#endif

		/*
		* addba_resp_timer may have fired before we got here, and
		* caused WANT_STOP to be set. If the stop then was already
		* processed further, STOPPING might be set.
		*/
		if (test_bit(HT_AGG_STATE_WANT_STOP, &tid_tx->state) \|\|
		test_bit(HT_AGG_STATE_STOPPING, &tid_tx->state)) {
		#ifdef CONFIG_MAC80211_HT_DEBUG
		printk(KERN_DEBUG
		"got addBA resp for tid %d but we already gave up\n",
		tid);
		#endif
		goto out;
		}

		/*
		* IEEE 802.11-2007 7.3.1.14:
		* In an ADDBA Response frame, when the Status Code field

Admin message