Commit c98d8836 authored by Johannes Berg's avatar Johannes Berg
Browse files

wifi: mac80211: reload info pointer in ieee80211_tx_dequeue() 

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: 53168215 ("mac80211: fix VLAN handling with TXQs")
Link: https://msgid.link/20240131164910.b54c28d583bc.I29450cec84ea6773cff5d9c16ff92b836c331471@changeid


Signed-off-by: default avatarJohannes Berg <johannes.berg@intel.com>
parent 0647903e

net/mac80211/tx.c

+3 −2
Original line number Diff line number Diff line
@@ -5,7 +5,7 @@ 
 * Copyright 2006-2007	Jiri Benc <jbenc@suse.cz>

 * Copyright 2007	Johannes Berg <johannes@sipsolutions.net>

 * Copyright 2013-2014  Intel Mobile Communications GmbH

 * Copyright (C) 2018-2022 Intel Corporation

 * Copyright (C) 2018-2024 Intel Corporation

 *

 * Transmit and frame generation functions.

 */
@@ -3927,6 +3927,7 @@ struct sk_buff *ieee80211_tx_dequeue(struct ieee80211_hw *hw, 
			goto begin;



		skb = __skb_dequeue(&tx.skbs);

		info = IEEE80211_SKB_CB(skb);



		if (!skb_queue_empty(&tx.skbs)) {

			spin_lock_bh(&fq->lock);
@@ -3971,7 +3972,7 @@ struct sk_buff *ieee80211_tx_dequeue(struct ieee80211_hw *hw, 
	}



encap_out:

	IEEE80211_SKB_CB(skb)->control.vif = vif;

	info->control.vif = vif;



	if (tx.sta &&

	    wiphy_ext_feature_isset(local->hw.wiphy, NL80211_EXT_FEATURE_AQL)) {