openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

mac80211: Ensure tid_start_tx is protected by sta->lock 

All accesses of the tid_start_tx lock should be protected
by sta->lock if there is any chance that another thread
could still be accessing the sta object.

Signed-off-by: Ben Greear <greearb@candelatech.com>
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
This commit is contained in:
Ben Greear 2013-06-12 14:08:44 -07:00 committed by Johannes Berg
parent 661eb3811d
commit e562078a19
2 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
net/mac80211/ht.c
View File

@ -281,13 +281,14 @@ void ieee80211_ba_session_work(struct work_struct *work)
sta, tid, WLAN_BACK_RECIPIENT, sta, tid, WLAN_BACK_RECIPIENT,
WLAN_REASON_UNSPECIFIED, true); WLAN_REASON_UNSPECIFIED, true);
spin_lock_bh(&sta->lock);
tid_tx = sta->ampdu_mlme.tid_start_tx[tid]; tid_tx = sta->ampdu_mlme.tid_start_tx[tid];
if (tid_tx) { if (tid_tx) {
/* /*
* Assign it over to the normal tid_tx array * Assign it over to the normal tid_tx array
* where it "goes live". * where it "goes live".
*/ */
spin_lock_bh(&sta->lock);
sta->ampdu_mlme.tid_start_tx[tid] = NULL; sta->ampdu_mlme.tid_start_tx[tid] = NULL;
/* could there be a race? */ /* could there be a race? */
@ -300,6 +301,7 @@ void ieee80211_ba_session_work(struct work_struct *work)
ieee80211_tx_ba_session_handle_start(sta, tid); ieee80211_tx_ba_session_handle_start(sta, tid);
continue; continue;
} }
spin_unlock_bh(&sta->lock);
tid_tx = rcu_dereference_protected_tid_tx(sta, tid); tid_tx = rcu_dereference_protected_tid_tx(sta, tid);
if (tid_tx && test_and_clear_bit(HT_AGG_STATE_WANT_STOP, if (tid_tx && test_and_clear_bit(HT_AGG_STATE_WANT_STOP,

1
net/mac80211/sta_info.h
View File

@ -203,6 +203,7 @@ struct tid_ampdu_rx {
* driver requested to close until the work for it runs * driver requested to close until the work for it runs
* @mtx: mutex to protect all TX data (except non-NULL assignments * @mtx: mutex to protect all TX data (except non-NULL assignments
* to tid_tx[idx], which are protected by the sta spinlock) * to tid_tx[idx], which are protected by the sta spinlock)
* tid_start_tx is also protected by sta->lock.
*/ */
struct sta_ampdu_mlme { struct sta_ampdu_mlme {
struct mutex mtx; struct mutex mtx;