* [PATCH net] net: libwx: fix memory leak on msix entry
@ 2023-11-28 9:59 Jiawen Wu
2023-11-29 3:20 ` Jiawen Wu
` (2 more replies)
0 siblings, 3 replies; 4+ messages in thread
From: Jiawen Wu @ 2023-11-28 9:59 UTC (permalink / raw)
To: netdev, edumazet, davem, kuba, pabeni; +Cc: mengyuanlou, Jiawen Wu
Since pci_free_irq_vectors() set pdev->msix_enabled as 0 in the
calling of pci_msix_shutdown(), wx->msix_entries is never freed.
Reordering the lines to fix the memory leak.
Fixes: 3f703186113f ("net: libwx: Add irq flow functions")
Signed-off-by: Jiawen Wu <jiawenwu@trustnetic•com>
---
drivers/net/ethernet/wangxun/libwx/wx_lib.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/net/ethernet/wangxun/libwx/wx_lib.c b/drivers/net/ethernet/wangxun/libwx/wx_lib.c
index 2823861e5a92..a5a50b5a8816 100644
--- a/drivers/net/ethernet/wangxun/libwx/wx_lib.c
+++ b/drivers/net/ethernet/wangxun/libwx/wx_lib.c
@@ -1972,11 +1972,11 @@ void wx_reset_interrupt_capability(struct wx *wx)
if (!pdev->msi_enabled && !pdev->msix_enabled)
return;
- pci_free_irq_vectors(wx->pdev);
if (pdev->msix_enabled) {
kfree(wx->msix_entries);
wx->msix_entries = NULL;
}
+ pci_free_irq_vectors(wx->pdev);
}
EXPORT_SYMBOL(wx_reset_interrupt_capability);
--
2.27.0
^ permalink raw reply related [flat|nested] 4+ messages in thread* RE: [PATCH net] net: libwx: fix memory leak on msix entry
2023-11-28 9:59 [PATCH net] net: libwx: fix memory leak on msix entry Jiawen Wu
@ 2023-11-29 3:20 ` Jiawen Wu
2023-11-29 3:51 ` Kalesh Anakkur Purayil
2023-11-30 4:20 ` patchwork-bot+netdevbpf
2 siblings, 0 replies; 4+ messages in thread
From: Jiawen Wu @ 2023-11-29 3:20 UTC (permalink / raw)
To: netdev, edumazet, davem, kuba, pabeni; +Cc: mengyuanlou, stable
Cc: stable@vger•kernel.org
> -----Original Message-----
> From: Jiawen Wu <jiawenwu@trustnetic•com>
> Sent: Tuesday, November 28, 2023 5:59 PM
> To: netdev@vger•kernel.org; edumazet@google•com; davem@davemloft•net; kuba@kernel•org; pabeni@redhat•com
> Cc: mengyuanlou@net-swift•com; Jiawen Wu <jiawenwu@trustnetic•com>
> Subject: [PATCH net] net: libwx: fix memory leak on msix entry
>
> Since pci_free_irq_vectors() set pdev->msix_enabled as 0 in the
> calling of pci_msix_shutdown(), wx->msix_entries is never freed.
> Reordering the lines to fix the memory leak.
>
> Fixes: 3f703186113f ("net: libwx: Add irq flow functions")
> Signed-off-by: Jiawen Wu <jiawenwu@trustnetic•com>
> ---
> drivers/net/ethernet/wangxun/libwx/wx_lib.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/drivers/net/ethernet/wangxun/libwx/wx_lib.c b/drivers/net/ethernet/wangxun/libwx/wx_lib.c
> index 2823861e5a92..a5a50b5a8816 100644
> --- a/drivers/net/ethernet/wangxun/libwx/wx_lib.c
> +++ b/drivers/net/ethernet/wangxun/libwx/wx_lib.c
> @@ -1972,11 +1972,11 @@ void wx_reset_interrupt_capability(struct wx *wx)
> if (!pdev->msi_enabled && !pdev->msix_enabled)
> return;
>
> - pci_free_irq_vectors(wx->pdev);
> if (pdev->msix_enabled) {
> kfree(wx->msix_entries);
> wx->msix_entries = NULL;
> }
> + pci_free_irq_vectors(wx->pdev);
> }
> EXPORT_SYMBOL(wx_reset_interrupt_capability);
>
> --
> 2.27.0
>
^ permalink raw reply [flat|nested] 4+ messages in thread* Re: [PATCH net] net: libwx: fix memory leak on msix entry
2023-11-28 9:59 [PATCH net] net: libwx: fix memory leak on msix entry Jiawen Wu
2023-11-29 3:20 ` Jiawen Wu
@ 2023-11-29 3:51 ` Kalesh Anakkur Purayil
2023-11-30 4:20 ` patchwork-bot+netdevbpf
2 siblings, 0 replies; 4+ messages in thread
From: Kalesh Anakkur Purayil @ 2023-11-29 3:51 UTC (permalink / raw)
To: Jiawen Wu; +Cc: netdev, edumazet, davem, kuba, pabeni, mengyuanlou
[-- Attachment #1.1: Type: text/plain, Size: 1347 bytes --]
On Tue, Nov 28, 2023 at 3:35 PM Jiawen Wu <jiawenwu@trustnetic•com> wrote:
> Since pci_free_irq_vectors() set pdev->msix_enabled as 0 in the
> calling of pci_msix_shutdown(), wx->msix_entries is never freed.
> Reordering the lines to fix the memory leak.
>
> Fixes: 3f703186113f ("net: libwx: Add irq flow functions")
> Signed-off-by: Jiawen Wu <jiawenwu@trustnetic•com>
> ---
> drivers/net/ethernet/wangxun/libwx/wx_lib.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
Looks good to me.
Reviewed-by: Kalesh AP <kalesh-anakkur.purayil@broadcom•com>
>
> diff --git a/drivers/net/ethernet/wangxun/libwx/wx_lib.c
> b/drivers/net/ethernet/wangxun/libwx/wx_lib.c
> index 2823861e5a92..a5a50b5a8816 100644
> --- a/drivers/net/ethernet/wangxun/libwx/wx_lib.c
> +++ b/drivers/net/ethernet/wangxun/libwx/wx_lib.c
> @@ -1972,11 +1972,11 @@ void wx_reset_interrupt_capability(struct wx *wx)
> if (!pdev->msi_enabled && !pdev->msix_enabled)
> return;
>
> - pci_free_irq_vectors(wx->pdev);
> if (pdev->msix_enabled) {
> kfree(wx->msix_entries);
> wx->msix_entries = NULL;
> }
> + pci_free_irq_vectors(wx->pdev);
> }
> EXPORT_SYMBOL(wx_reset_interrupt_capability);
>
> --
> 2.27.0
>
>
>
--
Regards,
Kalesh A P
[-- Attachment #1.2: Type: text/html, Size: 2246 bytes --]
[-- Attachment #2: S/MIME Cryptographic Signature --]
[-- Type: application/pkcs7-signature, Size: 4239 bytes --]
^ permalink raw reply [flat|nested] 4+ messages in thread* Re: [PATCH net] net: libwx: fix memory leak on msix entry
2023-11-28 9:59 [PATCH net] net: libwx: fix memory leak on msix entry Jiawen Wu
2023-11-29 3:20 ` Jiawen Wu
2023-11-29 3:51 ` Kalesh Anakkur Purayil
@ 2023-11-30 4:20 ` patchwork-bot+netdevbpf
2 siblings, 0 replies; 4+ messages in thread
From: patchwork-bot+netdevbpf @ 2023-11-30 4:20 UTC (permalink / raw)
To: Jiawen Wu; +Cc: netdev, edumazet, davem, kuba, pabeni, mengyuanlou
Hello:
This patch was applied to netdev/net.git (main)
by Jakub Kicinski <kuba@kernel•org>:
On Tue, 28 Nov 2023 17:59:28 +0800 you wrote:
> Since pci_free_irq_vectors() set pdev->msix_enabled as 0 in the
> calling of pci_msix_shutdown(), wx->msix_entries is never freed.
> Reordering the lines to fix the memory leak.
>
> Fixes: 3f703186113f ("net: libwx: Add irq flow functions")
> Signed-off-by: Jiawen Wu <jiawenwu@trustnetic•com>
>
> [...]
Here is the summary with links:
- [net] net: libwx: fix memory leak on msix entry
https://git.kernel.org/netdev/net/c/91fdb30ddfdb
You are awesome, thank you!
--
Deet-doot-dot, I am a bot.
https://korg.docs.kernel.org/patchwork/pwbot.html
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2023-11-30 4:20 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2023-11-28 9:59 [PATCH net] net: libwx: fix memory leak on msix entry Jiawen Wu
2023-11-29 3:20 ` Jiawen Wu
2023-11-29 3:51 ` Kalesh Anakkur Purayil
2023-11-30 4:20 ` patchwork-bot+netdevbpf
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox