Received-SPF: pass (google.com: domain of linux-wireless-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20;
Message-ID: <52f498b9-9fc1-aabb-fad8-ef6ce95b594b@gmail.com>
Date:   Fri, 9 Sep 2022 18:03:33 +0300
MIME-Version: 1.0
User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:91.0) Gecko/20100101
 Thunderbird/91.12.0
Subject: Re: [PATCH v2] wifi: rtl8xxxu: Fix skb misuse in TX queue selection
Content-Language: en-US
To:     Jes Sorensen <jes.sorensen@gmail.com>,
        linux-wireless@vger.kernel.org
References: <7fa4819a-4f20-b2af-b7a6-8ee01ac49295@gmail.com>
 <acd30174-4541-7343-e49a-badd199f4151@gmail.com>
From:   Bitterblue Smith <rtl8821cerfe2@gmail.com>
In-Reply-To: <acd30174-4541-7343-e49a-badd199f4151@gmail.com>
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 7bit
Precedence: bulk

On 07/09/2022 18:02, Jes Sorensen wrote:
> On 8/31/22 12:12, Bitterblue Smith wrote:
[...]
>> diff --git a/drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_core.c b/drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_core.c
>> index 52240e945b58..8d6f693bf60b 100644
>> --- a/drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_core.c
>> +++ b/drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_core.c
>> @@ -5177,6 +5177,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);
>> @@ -5189,7 +5191,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);
> 
> This could actually be made more resilient from someone moving the code
> around by passing in 'hdr' instead of relying on using skb->data in
> rtl8xxxu_queue_select(). We could also get rid of the hw argument to
> that function since it isn't used.
> 
> Cheers,
> Jes
> 

Good ideas! I'll do that when I'm done fiddling with the RTL8188FU.