* [PATCH] i40e: prevent memory leak in i40e_setup_macvlans
@ 2019-09-25 15:48 Navid Emamdoost
2019-09-27 15:04 ` Markus Elfring
2019-09-27 19:01 ` [Intel-wired-lan] " Bowers, AndrewX
0 siblings, 2 replies; 3+ messages in thread
From: Navid Emamdoost @ 2019-09-25 15:48 UTC (permalink / raw)
Cc: emamd001, kjlu, smccaman, Navid Emamdoost, Jeff Kirsher,
David S. Miller, intel-wired-lan, netdev, linux-kernel
In i40e_setup_macvlans if i40e_setup_channel fails the allocated memory
for ch should be released.
Signed-off-by: Navid Emamdoost <navid.emamdoost@gmail.com>
---
drivers/net/ethernet/intel/i40e/i40e_main.c | 1 +
1 file changed, 1 insertion(+)
diff --git a/drivers/net/ethernet/intel/i40e/i40e_main.c b/drivers/net/ethernet/intel/i40e/i40e_main.c
index 6031223eafab..7d4a14c3fe58 100644
--- a/drivers/net/ethernet/intel/i40e/i40e_main.c
+++ b/drivers/net/ethernet/intel/i40e/i40e_main.c
@@ -7168,6 +7168,7 @@ static int i40e_setup_macvlans(struct i40e_vsi *vsi, u16 macvlan_cnt, u16 qcnt,
ch->num_queue_pairs = qcnt;
if (!i40e_setup_channel(pf, vsi, ch)) {
ret = -EINVAL;
+ kfree(ch);
goto err_free;
}
ch->parent_vsi = vsi;
--
2.17.1
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [PATCH] i40e: prevent memory leak in i40e_setup_macvlans
2019-09-25 15:48 [PATCH] i40e: prevent memory leak in i40e_setup_macvlans Navid Emamdoost
@ 2019-09-27 15:04 ` Markus Elfring
2019-09-27 19:01 ` [Intel-wired-lan] " Bowers, AndrewX
1 sibling, 0 replies; 3+ messages in thread
From: Markus Elfring @ 2019-09-27 15:04 UTC (permalink / raw)
To: Navid Emamdoost, intel-wired-lan, netdev
Cc: Navid Emamdoost, Kangjie Lu, Stephen A McCamant, David S. Miller,
Jeffrey Kirsher, linux-kernel, kernel-janitors
> In i40e_setup_macvlans if i40e_setup_channel fails the allocated memory
> for ch should be released.
I suggest to improve also this change description.
> +++ b/drivers/net/ethernet/intel/i40e/i40e_main.c
> @@ -7168,6 +7168,7 @@ static int i40e_setup_macvlans(struct i40e_vsi *vsi, u16 macvlan_cnt, u16 qcnt,
> ch->num_queue_pairs = qcnt;
> if (!i40e_setup_channel(pf, vsi, ch)) {
> ret = -EINVAL;
> + kfree(ch);
> goto err_free;
> }
> ch->parent_vsi = vsi;
Can it matter to perform the added function call before the error code assignment?
Regards,
Markus
^ permalink raw reply [flat|nested] 3+ messages in thread
* RE: [Intel-wired-lan] [PATCH] i40e: prevent memory leak in i40e_setup_macvlans
2019-09-25 15:48 [PATCH] i40e: prevent memory leak in i40e_setup_macvlans Navid Emamdoost
2019-09-27 15:04 ` Markus Elfring
@ 2019-09-27 19:01 ` Bowers, AndrewX
1 sibling, 0 replies; 3+ messages in thread
From: Bowers, AndrewX @ 2019-09-27 19:01 UTC (permalink / raw)
Cc: netdev, linux-kernel, intel-wired-lan
> -----Original Message-----
> From: Intel-wired-lan [mailto:intel-wired-lan-bounces@osuosl.org] On
> Behalf Of Navid Emamdoost
> Sent: Wednesday, September 25, 2019 8:49 AM
> Cc: netdev@vger.kernel.org; kjlu@umn.edu; linux-kernel@vger.kernel.org;
> emamd001@umn.edu; intel-wired-lan@lists.osuosl.org;
> smccaman@umn.edu; David S. Miller <davem@davemloft.net>; Navid
> Emamdoost <navid.emamdoost@gmail.com>
> Subject: [Intel-wired-lan] [PATCH] i40e: prevent memory leak in
> i40e_setup_macvlans
>
> In i40e_setup_macvlans if i40e_setup_channel fails the allocated memory for
> ch should be released.
>
> Signed-off-by: Navid Emamdoost <navid.emamdoost@gmail.com>
> ---
> drivers/net/ethernet/intel/i40e/i40e_main.c | 1 +
> 1 file changed, 1 insertion(+)
Tested-by: Andrew Bowers <andrewx.bowers@intel.com>
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2019-09-27 19:01 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2019-09-25 15:48 [PATCH] i40e: prevent memory leak in i40e_setup_macvlans Navid Emamdoost
2019-09-27 15:04 ` Markus Elfring
2019-09-27 19:01 ` [Intel-wired-lan] " Bowers, AndrewX
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).