* [PATCH] nfp: flower: prevent memory leak in nfp_flower_spawn_phy_reprs
@ 2019-09-25 18:24 Navid Emamdoost
2019-09-26 1:23 ` Jakub Kicinski
` (2 more replies)
0 siblings, 3 replies; 4+ messages in thread
From: Navid Emamdoost @ 2019-09-25 18:24 UTC (permalink / raw)
Cc: emamd001, kjlu, smccaman, Navid Emamdoost, Jakub Kicinski,
David S. Miller, John Hurley, Simon Horman,
Pieter Jansen van Vuuren, Fred Lotter, oss-drivers, netdev,
linux-kernel
In nfp_flower_spawn_phy_reprs, in the for loop over eth_tbl if any of
intermediate allocations or initializations fail memory is leaked.
requiered releases are added.
Signed-off-by: Navid Emamdoost <navid.emamdoost@gmail.com>
---
drivers/net/ethernet/netronome/nfp/flower/main.c | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/drivers/net/ethernet/netronome/nfp/flower/main.c b/drivers/net/ethernet/netronome/nfp/flower/main.c
index 7a20447cca19..91a47899220f 100644
--- a/drivers/net/ethernet/netronome/nfp/flower/main.c
+++ b/drivers/net/ethernet/netronome/nfp/flower/main.c
@@ -515,6 +515,7 @@ nfp_flower_spawn_phy_reprs(struct nfp_app *app, struct nfp_flower_priv *priv)
repr_priv = kzalloc(sizeof(*repr_priv), GFP_KERNEL);
if (!repr_priv) {
err = -ENOMEM;
+ nfp_repr_free(repr);
goto err_reprs_clean;
}
@@ -525,11 +526,13 @@ nfp_flower_spawn_phy_reprs(struct nfp_app *app, struct nfp_flower_priv *priv)
port = nfp_port_alloc(app, NFP_PORT_PHYS_PORT, repr);
if (IS_ERR(port)) {
err = PTR_ERR(port);
+ kfree(repr_priv);
nfp_repr_free(repr);
goto err_reprs_clean;
}
err = nfp_port_init_phy_port(app->pf, app, port, i);
if (err) {
+ kfree(repr_priv);
nfp_port_free(port);
nfp_repr_free(repr);
goto err_reprs_clean;
@@ -542,6 +545,7 @@ nfp_flower_spawn_phy_reprs(struct nfp_app *app, struct nfp_flower_priv *priv)
err = nfp_repr_init(app, repr,
cmsg_port_id, port, priv->nn->dp.netdev);
if (err) {
+ kfree(repr_priv);
nfp_port_free(port);
nfp_repr_free(repr);
goto err_reprs_clean;
--
2.17.1
^ permalink raw reply related [flat|nested] 4+ messages in thread* Re: [PATCH] nfp: flower: prevent memory leak in nfp_flower_spawn_phy_reprs
2019-09-25 18:24 [PATCH] nfp: flower: prevent memory leak in nfp_flower_spawn_phy_reprs Navid Emamdoost
@ 2019-09-26 1:23 ` Jakub Kicinski
2019-09-27 14:26 ` Markus Elfring
2019-09-27 18:12 ` David Miller
2 siblings, 0 replies; 4+ messages in thread
From: Jakub Kicinski @ 2019-09-26 1:23 UTC (permalink / raw)
To: Navid Emamdoost
Cc: emamd001, kjlu, smccaman, David S. Miller, John Hurley,
Simon Horman, Pieter Jansen van Vuuren, Fred Lotter, oss-drivers,
netdev, linux-kernel
On Wed, 25 Sep 2019 13:24:02 -0500, Navid Emamdoost wrote:
> In nfp_flower_spawn_phy_reprs, in the for loop over eth_tbl if any of
> intermediate allocations or initializations fail memory is leaked.
> requiered releases are added.
>
> Signed-off-by: Navid Emamdoost <navid.emamdoost@gmail.com>
Fixes: b94524529741 ("nfp: flower: add per repr private data for LAG offload")
Acked-by: Jakub Kicinski <jakub.kicinski@netronome.com>
^ permalink raw reply [flat|nested] 4+ messages in thread* Re: [PATCH] nfp: flower: prevent memory leak in nfp_flower_spawn_phy_reprs
2019-09-25 18:24 [PATCH] nfp: flower: prevent memory leak in nfp_flower_spawn_phy_reprs Navid Emamdoost
2019-09-26 1:23 ` Jakub Kicinski
@ 2019-09-27 14:26 ` Markus Elfring
2019-09-27 18:12 ` David Miller
2 siblings, 0 replies; 4+ messages in thread
From: Markus Elfring @ 2019-09-27 14:26 UTC (permalink / raw)
To: Navid Emamdoost, Jakub Kicinski, netdev, oss-drivers
Cc: Navid Emamdoost, Kangjie Lu, Stephen A McCamant, David S. Miller,
Frederik Lotter, John Hurley, Pieter Jansen van Vuuren,
Simon Horman, linux-kernel, kernel-janitors
> In nfp_flower_spawn_phy_reprs, in the for loop over eth_tbl if any of
> intermediate allocations or initializations fail memory is leaked.
> requiered releases are added.
I suggest to improve also this change description.
> @@ -542,6 +545,7 @@ nfp_flower_spawn_phy_reprs(struct nfp_app *app, struct nfp_flower_priv *priv)
> err = nfp_repr_init(app, repr,
> cmsg_port_id, port, priv->nn->dp.netdev);
> if (err) {
> + kfree(repr_priv);
> nfp_port_free(port);
> nfp_repr_free(repr);
> goto err_reprs_clean;
How do you think about to move common exception handling code
to the end of this function implementation by adding jump targets?
Regards,
Markus
^ permalink raw reply [flat|nested] 4+ messages in thread* Re: [PATCH] nfp: flower: prevent memory leak in nfp_flower_spawn_phy_reprs
2019-09-25 18:24 [PATCH] nfp: flower: prevent memory leak in nfp_flower_spawn_phy_reprs Navid Emamdoost
2019-09-26 1:23 ` Jakub Kicinski
2019-09-27 14:26 ` Markus Elfring
@ 2019-09-27 18:12 ` David Miller
2 siblings, 0 replies; 4+ messages in thread
From: David Miller @ 2019-09-27 18:12 UTC (permalink / raw)
To: navid.emamdoost
Cc: emamd001, kjlu, smccaman, jakub.kicinski, john.hurley,
simon.horman, pieter.jansenvanvuuren, frederik.lotter,
oss-drivers, netdev, linux-kernel
From: Navid Emamdoost <navid.emamdoost@gmail.com>
Date: Wed, 25 Sep 2019 13:24:02 -0500
> In nfp_flower_spawn_phy_reprs, in the for loop over eth_tbl if any of
> intermediate allocations or initializations fail memory is leaked.
> requiered releases are added.
>
> Signed-off-by: Navid Emamdoost <navid.emamdoost@gmail.com>
Applied.
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2019-09-27 18:12 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2019-09-25 18:24 [PATCH] nfp: flower: prevent memory leak in nfp_flower_spawn_phy_reprs Navid Emamdoost
2019-09-26 1:23 ` Jakub Kicinski
2019-09-27 14:26 ` Markus Elfring
2019-09-27 18:12 ` David Miller
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox