* [PATCH] wifi: ath12k: fix skb_ext_desc leak in ath12k_dp_tx error path
@ 2025-01-22 16:01 Nicolas Escande
2025-01-22 16:46 ` Aditya Kumar Singh
2025-01-23 16:05 ` Jeff Johnson
0 siblings, 2 replies; 7+ messages in thread
From: Nicolas Escande @ 2025-01-22 16:01 UTC (permalink / raw)
To: ath12k; +Cc: linux-wireless
When vlan support was added, we missed that when
ath12k_dp_prepare_htt_metadata returns an error we also need to free the
skb holding the metadata before going on with the cleanup process.
Compile tested only.
Fixes: 26dd8ccdba4d ("wifi: ath12k: dynamic VLAN support")
Signed-off-by: Nicolas Escande <nico.escande@gmail.com>
---
drivers/net/wireless/ath/ath12k/dp_tx.c | 1 +
1 file changed, 1 insertion(+)
diff --git a/drivers/net/wireless/ath/ath12k/dp_tx.c b/drivers/net/wireless/ath/ath12k/dp_tx.c
index a8d341a6df01e..e0b85f959cd4a 100644
--- a/drivers/net/wireless/ath/ath12k/dp_tx.c
+++ b/drivers/net/wireless/ath/ath12k/dp_tx.c
@@ -398,6 +398,7 @@ int ath12k_dp_tx(struct ath12k *ar, struct ath12k_link_vif *arvif,
if (ret < 0) {
ath12k_dbg(ab, ATH12K_DBG_DP_TX,
"Failed to add HTT meta data, dropping packet\n");
+ kfree_skb(skb_ext_desc);
goto fail_unmap_dma;
}
}
--
2.48.1
^ permalink raw reply related [flat|nested] 7+ messages in thread* Re: [PATCH] wifi: ath12k: fix skb_ext_desc leak in ath12k_dp_tx error path
2025-01-22 16:01 [PATCH] wifi: ath12k: fix skb_ext_desc leak in ath12k_dp_tx error path Nicolas Escande
@ 2025-01-22 16:46 ` Aditya Kumar Singh
2025-01-22 18:20 ` Jeff Johnson
2025-01-23 16:05 ` Jeff Johnson
1 sibling, 1 reply; 7+ messages in thread
From: Aditya Kumar Singh @ 2025-01-22 16:46 UTC (permalink / raw)
To: Nicolas Escande, ath12k; +Cc: linux-wireless
On 1/22/25 21:31, Nicolas Escande wrote:
> When vlan support was added, we missed that when
> ath12k_dp_prepare_htt_metadata returns an error we also need to free the
nit: Always refer function name with () for clarity.
> skb holding the metadata before going on with the cleanup process.
> Compile tested only.
>
> Fixes: 26dd8ccdba4d ("wifi: ath12k: dynamic VLAN support")
> Signed-off-by: Nicolas Escande <nico.escande@gmail.com>
> ---
If there's going to be a new version please take care of above nit
comment. Otherwise -
Reviewed-by: Aditya Kumar Singh <aditya.kumar.singh@oss.qualcomm.com>
--
Aditya
^ permalink raw reply [flat|nested] 7+ messages in thread* Re: [PATCH] wifi: ath12k: fix skb_ext_desc leak in ath12k_dp_tx error path
2025-01-22 16:46 ` Aditya Kumar Singh
@ 2025-01-22 18:20 ` Jeff Johnson
2025-01-22 20:19 ` Jeff Johnson
0 siblings, 1 reply; 7+ messages in thread
From: Jeff Johnson @ 2025-01-22 18:20 UTC (permalink / raw)
To: Aditya Kumar Singh, Nicolas Escande, ath12k; +Cc: linux-wireless
On 1/22/2025 8:46 AM, Aditya Kumar Singh wrote:
> On 1/22/25 21:31, Nicolas Escande wrote:
>> When vlan support was added, we missed that when
>> ath12k_dp_prepare_htt_metadata returns an error we also need to free the
>
> nit: Always refer function name with () for clarity.
>
>> skb holding the metadata before going on with the cleanup process.
>> Compile tested only.
>>
>> Fixes: 26dd8ccdba4d ("wifi: ath12k: dynamic VLAN support")
>> Signed-off-by: Nicolas Escande <nico.escande@gmail.com>
>> ---
>
> If there's going to be a new version please take care of above nit
> comment. Otherwise -
>
> Reviewed-by: Aditya Kumar Singh <aditya.kumar.singh@oss.qualcomm.com>
>
>
I'll fixup () in both subject and description
^ permalink raw reply [flat|nested] 7+ messages in thread* Re: [PATCH] wifi: ath12k: fix skb_ext_desc leak in ath12k_dp_tx error path
2025-01-22 18:20 ` Jeff Johnson
@ 2025-01-22 20:19 ` Jeff Johnson
2025-01-23 2:02 ` Aditya Kumar Singh
2025-01-23 9:26 ` Nicolas Escande
0 siblings, 2 replies; 7+ messages in thread
From: Jeff Johnson @ 2025-01-22 20:19 UTC (permalink / raw)
To: Aditya Kumar Singh, Nicolas Escande, ath12k; +Cc: linux-wireless
On 1/22/2025 10:20 AM, Jeff Johnson wrote:
> On 1/22/2025 8:46 AM, Aditya Kumar Singh wrote:
>> On 1/22/25 21:31, Nicolas Escande wrote:
>>> When vlan support was added, we missed that when
>>> ath12k_dp_prepare_htt_metadata returns an error we also need to free the
>>
>> nit: Always refer function name with () for clarity.
>>
>>> skb holding the metadata before going on with the cleanup process.
>>> Compile tested only.
>>>
>>> Fixes: 26dd8ccdba4d ("wifi: ath12k: dynamic VLAN support")
>>> Signed-off-by: Nicolas Escande <nico.escande@gmail.com>
>>> ---
>>
>> If there's going to be a new version please take care of above nit
>> comment. Otherwise -
>>
>> Reviewed-by: Aditya Kumar Singh <aditya.kumar.singh@oss.qualcomm.com>
>>
>>
>
> I'll fixup () in both subject and description
fixup in pending:
https://git.kernel.org/pub/scm/linux/kernel/git/ath/ath.git/commit/?h=pending&id=29d6569f323a88ccb3239abea562f6e691cfd9e4
^ permalink raw reply [flat|nested] 7+ messages in thread* Re: [PATCH] wifi: ath12k: fix skb_ext_desc leak in ath12k_dp_tx error path
2025-01-22 20:19 ` Jeff Johnson
@ 2025-01-23 2:02 ` Aditya Kumar Singh
2025-01-23 9:26 ` Nicolas Escande
1 sibling, 0 replies; 7+ messages in thread
From: Aditya Kumar Singh @ 2025-01-23 2:02 UTC (permalink / raw)
To: Jeff Johnson, Nicolas Escande, ath12k; +Cc: linux-wireless
On 1/23/25 01:49, Jeff Johnson wrote:
> On 1/22/2025 10:20 AM, Jeff Johnson wrote:
>> On 1/22/2025 8:46 AM, Aditya Kumar Singh wrote:
>>> On 1/22/25 21:31, Nicolas Escande wrote:
>>>> When vlan support was added, we missed that when
>>>> ath12k_dp_prepare_htt_metadata returns an error we also need to free the
>>>
>>> nit: Always refer function name with () for clarity.
>>>
>>>> skb holding the metadata before going on with the cleanup process.
>>>> Compile tested only.
>>>>
>>>> Fixes: 26dd8ccdba4d ("wifi: ath12k: dynamic VLAN support")
>>>> Signed-off-by: Nicolas Escande <nico.escande@gmail.com>
>>>> ---
>>>
>>> If there's going to be a new version please take care of above nit
>>> comment. Otherwise -
>>>
>>> Reviewed-by: Aditya Kumar Singh <aditya.kumar.singh@oss.qualcomm.com>
>>>
>>>
>>
>> I'll fixup () in both subject and description
>
> fixup in pending:
>
> https://git.kernel.org/pub/scm/linux/kernel/git/ath/ath.git/commit/?h=pending&id=29d6569f323a88ccb3239abea562f6e691cfd9e4
Looks good.
--
Aditya
^ permalink raw reply [flat|nested] 7+ messages in thread* Re: [PATCH] wifi: ath12k: fix skb_ext_desc leak in ath12k_dp_tx error path
2025-01-22 20:19 ` Jeff Johnson
2025-01-23 2:02 ` Aditya Kumar Singh
@ 2025-01-23 9:26 ` Nicolas Escande
1 sibling, 0 replies; 7+ messages in thread
From: Nicolas Escande @ 2025-01-23 9:26 UTC (permalink / raw)
To: Jeff Johnson, Aditya Kumar Singh, ath12k; +Cc: linux-wireless
On Wed Jan 22, 2025 at 9:19 PM CET, Jeff Johnson wrote:
> On 1/22/2025 10:20 AM, Jeff Johnson wrote:
>> On 1/22/2025 8:46 AM, Aditya Kumar Singh wrote:
>>> On 1/22/25 21:31, Nicolas Escande wrote:
>>>> When vlan support was added, we missed that when
>>>> ath12k_dp_prepare_htt_metadata returns an error we also need to free the
>>>
>>> nit: Always refer function name with () for clarity.
>>>
>>>> skb holding the metadata before going on with the cleanup process.
>>>> Compile tested only.
>>>>
>>>> Fixes: 26dd8ccdba4d ("wifi: ath12k: dynamic VLAN support")
>>>> Signed-off-by: Nicolas Escande <nico.escande@gmail.com>
>>>> ---
>>>
>>> If there's going to be a new version please take care of above nit
>>> comment. Otherwise -
>>>
>>> Reviewed-by: Aditya Kumar Singh <aditya.kumar.singh@oss.qualcomm.com>
>>>
>>>
>>
>> I'll fixup () in both subject and description
>
> fixup in pending:
>
> https://git.kernel.org/pub/scm/linux/kernel/git/ath/ath.git/commit/?h=pending&id=29d6569f323a88ccb3239abea562f6e691cfd9e4
Perfect,
Thanks a lot !
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [PATCH] wifi: ath12k: fix skb_ext_desc leak in ath12k_dp_tx error path
2025-01-22 16:01 [PATCH] wifi: ath12k: fix skb_ext_desc leak in ath12k_dp_tx error path Nicolas Escande
2025-01-22 16:46 ` Aditya Kumar Singh
@ 2025-01-23 16:05 ` Jeff Johnson
1 sibling, 0 replies; 7+ messages in thread
From: Jeff Johnson @ 2025-01-23 16:05 UTC (permalink / raw)
To: ath12k, Nicolas Escande; +Cc: linux-wireless
On Wed, 22 Jan 2025 17:01:12 +0100, Nicolas Escande wrote:
> When vlan support was added, we missed that when
> ath12k_dp_prepare_htt_metadata returns an error we also need to free the
> skb holding the metadata before going on with the cleanup process.
> Compile tested only.
>
>
Applied, thanks!
[1/1] wifi: ath12k: fix skb_ext_desc leak in ath12k_dp_tx error path
commit: 28a9972e0f0693cd4d08f431c992fa6be39c788c
Best regards,
--
Jeff Johnson <jeff.johnson@oss.qualcomm.com>
^ permalink raw reply [flat|nested] 7+ messages in thread
end of thread, other threads:[~2025-01-23 16:05 UTC | newest]
Thread overview: 7+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2025-01-22 16:01 [PATCH] wifi: ath12k: fix skb_ext_desc leak in ath12k_dp_tx error path Nicolas Escande
2025-01-22 16:46 ` Aditya Kumar Singh
2025-01-22 18:20 ` Jeff Johnson
2025-01-22 20:19 ` Jeff Johnson
2025-01-23 2:02 ` Aditya Kumar Singh
2025-01-23 9:26 ` Nicolas Escande
2025-01-23 16:05 ` Jeff Johnson
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox