Ksawlii/kernel_samsung_a53x
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

wifi: mac80211: reload info pointer in ieee80211_tx_dequeue()

Browse source 
commit c98d8836b817d11fdff4ca7749cbbe04ff7f0c64 upstream.

This pointer can change here since the SKB can change, so we
actually later open-coded IEEE80211_SKB_CB() again. Reload
the pointer where needed, so the monitor-mode case using it
gets fixed, and then use info-> later as well.

Cc: stable@vger.kernel.org
Fixes: 531682159092 ("mac80211: fix VLAN handling with TXQs")
Link: https://msgid.link/20240131164910.b54c28d583bc.I29450cec84ea6773cff5d9c16ff92b836c331471@changeid
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Johannes Berg 2024-01-31 16:49:10 +01:00 • committed by Ksawlii
parent 1e62219ee1
commit 91b4be3df0
1 changed files with 2 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
net/mac80211/tx.c
View file

@ -3721,6 +3721,7 @@ begin:
goto begin; goto begin;
skb = __skb_dequeue(&tx.skbs); skb = __skb_dequeue(&tx.skbs);
info = IEEE80211_SKB_CB(skb);
if (!skb_queue_empty(&tx.skbs)) { if (!skb_queue_empty(&tx.skbs)) {
spin_lock_bh(&fq->lock); spin_lock_bh(&fq->lock);
@ -3765,7 +3766,7 @@ begin:
} }
encap_out: encap_out:
IEEE80211_SKB_CB(skb)->control.vif = vif; info->control.vif = vif;
if (vif && if (vif &&
wiphy_ext_feature_isset(local->hw.wiphy, NL80211_EXT_FEATURE_AQL)) { wiphy_ext_feature_isset(local->hw.wiphy, NL80211_EXT_FEATURE_AQL)) {