* [PATCH] i40e: fix a memleak in i40e_init_recovery_mode
@ 2024-01-22 17:36 Zhipeng Lu
2024-01-22 21:10 ` Simon Horman
0 siblings, 1 reply; 2+ messages in thread
From: Zhipeng Lu @ 2024-01-22 17:36 UTC (permalink / raw)
To: alexious
Cc: Jesse Brandeburg, Tony Nguyen, David S. Miller, Eric Dumazet,
Jakub Kicinski, Paolo Abeni, Piotr Marczak, Alice Michael,
Jeff Kirsher, intel-wired-lan, netdev, linux-kernel
In i40e_init_recovery_mode, pf->vsi is allocated without free, causing
a memleak. This patch adds deallocation operations for pf->vsi in each
and every error-handling paths after pf->vsi's.
Fixes: 4ff0ee1af016 ("i40e: Introduce recovery mode support")
Signed-off-by: Zhipeng Lu <alexious@zju.edu.cn>
---
drivers/net/ethernet/intel/i40e/i40e_main.c | 13 +++++++------
1 file changed, 7 insertions(+), 6 deletions(-)
diff --git a/drivers/net/ethernet/intel/i40e/i40e_main.c b/drivers/net/ethernet/intel/i40e/i40e_main.c
index 1ab8dbe2d880..a2ed6bb3b2dc 100644
--- a/drivers/net/ethernet/intel/i40e/i40e_main.c
+++ b/drivers/net/ethernet/intel/i40e/i40e_main.c
@@ -15598,27 +15598,27 @@ static int i40e_init_recovery_mode(struct i40e_pf *pf, struct i40e_hw *hw)
v_idx = i40e_vsi_mem_alloc(pf, I40E_VSI_MAIN);
if (v_idx < 0) {
err = v_idx;
- goto err_switch_setup;
+ goto err_vsis;
}
pf->lan_vsi = v_idx;
vsi = pf->vsi[v_idx];
if (!vsi) {
err = -EFAULT;
- goto err_switch_setup;
+ goto err_vsis;
}
vsi->alloc_queue_pairs = 1;
err = i40e_config_netdev(vsi);
if (err)
- goto err_switch_setup;
+ goto err_vsis;
err = register_netdev(vsi->netdev);
if (err)
- goto err_switch_setup;
+ goto err_vsis;
vsi->netdev_registered = true;
i40e_dbg_pf_init(pf);
err = i40e_setup_misc_vector_for_recovery_mode(pf);
if (err)
- goto err_switch_setup;
+ goto err_vsis;
/* tell the firmware that we're starting */
i40e_send_version(pf);
@@ -15628,7 +15628,8 @@ static int i40e_init_recovery_mode(struct i40e_pf *pf, struct i40e_hw *hw)
round_jiffies(jiffies + pf->service_timer_period));
return 0;
-
+err_vsis:
+ kfree(pf->vsi);
err_switch_setup:
i40e_reset_interrupt_capability(pf);
timer_shutdown_sync(&pf->service_timer);
--
2.34.1
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH] i40e: fix a memleak in i40e_init_recovery_mode
2024-01-22 17:36 [PATCH] i40e: fix a memleak in i40e_init_recovery_mode Zhipeng Lu
@ 2024-01-22 21:10 ` Simon Horman
0 siblings, 0 replies; 2+ messages in thread
From: Simon Horman @ 2024-01-22 21:10 UTC (permalink / raw)
To: Zhipeng Lu
Cc: Jesse Brandeburg, Tony Nguyen, David S. Miller, Eric Dumazet,
Jakub Kicinski, Paolo Abeni, Piotr Marczak, Alice Michael,
Jeff Kirsher, intel-wired-lan, netdev, linux-kernel
On Tue, Jan 23, 2024 at 01:36:33AM +0800, Zhipeng Lu wrote:
> In i40e_init_recovery_mode, pf->vsi is allocated without free, causing
> a memleak. This patch adds deallocation operations for pf->vsi in each
> and every error-handling paths after pf->vsi's.
>
> Fixes: 4ff0ee1af016 ("i40e: Introduce recovery mode support")
> Signed-off-by: Zhipeng Lu <alexious@zju.edu.cn>
Reviewed-by: Simon Horman <horms@kernel.org>
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2024-01-22 21:10 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2024-01-22 17:36 [PATCH] i40e: fix a memleak in i40e_init_recovery_mode Zhipeng Lu
2024-01-22 21:10 ` Simon Horman
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).