Skip to content

Commit dbef536

Browse files
Michal Kaziorjmberg-intel
authored andcommitted
mac80211: prevent skb/txq mismatch
Station structure is considered as not uploaded (to driver) until drv_sta_state() finishes. This call is however done after the structure is attached to mac80211 internal lists and hashes. This means mac80211 can lookup (and use) station structure before it is uploaded to a driver. If this happens (structure exists, but sta->uploaded is false) fast_tx path can still be taken. Deep in the fastpath call the sta->uploaded is checked against to derive "pubsta" argument for ieee80211_get_txq(). If sta->uploaded is false (and sta is actually non-NULL) ieee80211_get_txq() effectively downgraded to vif->txq. At first glance this may look innocent but coerces mac80211 into a state that is almost guaranteed (codel may drop offending skb) to crash because a station-oriented skb gets queued up on vif-oriented txq. The ieee80211_tx_dequeue() ends up looking at info->control.flags and tries to use txq->sta which in the fail case is NULL. It's probably pointless to pretend one can downgrade skb from sta-txq to vif-txq. Since downgrading unicast traffic to vif->txq must not be done there's no txq to put a frame on if sta->uploaded is false. Therefore the code is made to fall back to regular tx() op path if the described condition is hit. Only drivers using wake_tx_queue were affected. Example crash dump before fix: Unable to handle kernel paging request at virtual address ffffe26c PC is at ieee80211_tx_dequeue+0x204/0x690 [mac80211] [<bf4252a4>] (ieee80211_tx_dequeue [mac80211]) from [<bf4b1388>] (ath10k_mac_tx_push_txq+0x54/0x1c0 [ath10k_core]) [<bf4b1388>] (ath10k_mac_tx_push_txq [ath10k_core]) from [<bf4bdfbc>] (ath10k_htt_txrx_compl_task+0xd78/0x11d0 [ath10k_core]) [<bf4bdfbc>] (ath10k_htt_txrx_compl_task [ath10k_core]) [<bf51c5a4>] (ath10k_pci_napi_poll+0x54/0xe8 [ath10k_pci]) [<bf51c5a4>] (ath10k_pci_napi_poll [ath10k_pci]) from [<c0572e90>] (net_rx_action+0xac/0x160) Reported-by: Mohammed Shafi Shajakhan <[email protected]> Signed-off-by: Michal Kazior <[email protected]> Signed-off-by: Johannes Berg <[email protected]>
1 parent 43071d8 commit dbef536

File tree

1 file changed

+7
-10
lines changed

1 file changed

+7
-10
lines changed

net/mac80211/tx.c

Lines changed: 7 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1243,7 +1243,7 @@ ieee80211_tx_prepare(struct ieee80211_sub_if_data *sdata,
12431243

12441244
static struct txq_info *ieee80211_get_txq(struct ieee80211_local *local,
12451245
struct ieee80211_vif *vif,
1246-
struct ieee80211_sta *pubsta,
1246+
struct sta_info *sta,
12471247
struct sk_buff *skb)
12481248
{
12491249
struct ieee80211_hdr *hdr = (struct ieee80211_hdr *) skb->data;
@@ -1257,10 +1257,13 @@ static struct txq_info *ieee80211_get_txq(struct ieee80211_local *local,
12571257
if (!ieee80211_is_data(hdr->frame_control))
12581258
return NULL;
12591259

1260-
if (pubsta) {
1260+
if (sta) {
12611261
u8 tid = skb->priority & IEEE80211_QOS_CTL_TID_MASK;
12621262

1263-
txq = pubsta->txq[tid];
1263+
if (!sta->uploaded)
1264+
return NULL;
1265+
1266+
txq = sta->sta.txq[tid];
12641267
} else if (vif) {
12651268
txq = vif->txq;
12661269
}
@@ -1503,23 +1506,17 @@ static bool ieee80211_queue_skb(struct ieee80211_local *local,
15031506
struct fq *fq = &local->fq;
15041507
struct ieee80211_vif *vif;
15051508
struct txq_info *txqi;
1506-
struct ieee80211_sta *pubsta;
15071509

15081510
if (!local->ops->wake_tx_queue ||
15091511
sdata->vif.type == NL80211_IFTYPE_MONITOR)
15101512
return false;
15111513

1512-
if (sta && sta->uploaded)
1513-
pubsta = &sta->sta;
1514-
else
1515-
pubsta = NULL;
1516-
15171514
if (sdata->vif.type == NL80211_IFTYPE_AP_VLAN)
15181515
sdata = container_of(sdata->bss,
15191516
struct ieee80211_sub_if_data, u.ap);
15201517

15211518
vif = &sdata->vif;
1522-
txqi = ieee80211_get_txq(local, vif, pubsta, skb);
1519+
txqi = ieee80211_get_txq(local, vif, sta, skb);
15231520

15241521
if (!txqi)
15251522
return false;

0 commit comments

Comments
 (0)