Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 374dd4e5 authored by Bitterblue Smith's avatar Bitterblue Smith Committed by Greg Kroah-Hartman
Browse files

wifi: rtl8xxxu: Fix skb misuse in TX queue selection 



[ Upstream commit edd5747aa12ed61a5ecbfa58d3908623fddbf1e8 ]

rtl8xxxu_queue_select() selects the wrong TX queues because it's
reading memory from the wrong address. It expects to find ieee80211_hdr
at skb->data, but that's not the case after skb_push(). Move the call
to rtl8xxxu_queue_select() before the call to skb_push().

Fixes: 26f1fad2 ("New driver: rtl8xxxu (mac80211)")
Signed-off-by: default avatarBitterblue Smith <rtl8821cerfe2@gmail.com>
Signed-off-by: default avatarKalle Valo <kvalo@kernel.org>
Link: https://lore.kernel.org/r/7fa4819a-4f20-b2af-b7a6-8ee01ac49295@gmail.com


Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
parent df0b024a

drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_core.c

+2 −1
Original line number Diff line number Diff line
@@ -4950,6 +4950,8 @@ static void rtl8xxxu_tx(struct ieee80211_hw *hw, 
	if (control && control->sta)

		sta = control->sta;



	queue = rtl8xxxu_queue_select(hw, skb);



	tx_desc = skb_push(skb, tx_desc_size);



	memset(tx_desc, 0, tx_desc_size);
@@ -4962,7 +4964,6 @@ static void rtl8xxxu_tx(struct ieee80211_hw *hw, 
	    is_broadcast_ether_addr(ieee80211_get_DA(hdr)))

		tx_desc->txdw0 |= TXDESC_BROADMULTICAST;



	queue = rtl8xxxu_queue_select(hw, skb);

	tx_desc->txdw1 = cpu_to_le32(queue << TXDESC_QUEUE_SHIFT);



	if (tx_info->control.hw_key) {