2022-06-23 07:46:08

by Jianglei Nie

Subject: [PATCH] net: sfp: fix memory leak in sfp_probe()

sfp_probe() allocates a memory chunk from sfp with sfp_alloc(), when
devm_add_action() fails, sfp is not freed, which leads to a memory leak.

We should free the sfp with sfp_cleanup() when devm_add_action() fails.

Signed-off-by: Jianglei Nie <[email protected]>
---
drivers/net/phy/sfp.c | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/drivers/net/phy/sfp.c b/drivers/net/phy/sfp.c
index 9a5d5a10560f..366a89adabf5 100644
--- a/drivers/net/phy/sfp.c
+++ b/drivers/net/phy/sfp.c
@@ -2517,8 +2517,10 @@ static int sfp_probe(struct platform_device *pdev)
platform_set_drvdata(pdev, sfp);

err = devm_add_action(sfp->dev, sfp_cleanup, sfp);
- if (err < 0)
+ if (err < 0) {
+ sfp_cleanup(sfp);
return err;
+ }

sff = sfp->type = &sfp_data;

--
2.25.1

2022-06-23 07:48:30

by Michael Walle

Subject: Re: [PATCH] net: sfp: fix memory leak in sfp_probe()

Hi,

> err = devm_add_action(sfp->dev, sfp_cleanup, sfp);
> - if (err < 0)
> + if (err < 0) {
> + sfp_cleanup(sfp);
> return err;
> + }

Better use devm_add_action_or_reset(), no?

-michael

2022-06-23 08:47:22

by Christophe JAILLET

Subject: Re: [PATCH] net: sfp: fix memory leak in sfp_probe()

Le 23/06/2022 à 09:09, Jianglei Nie a écrit :
> sfp_probe() allocates a memory chunk from sfp with sfp_alloc(), when
> devm_add_action() fails, sfp is not freed, which leads to a memory leak.
>
> We should free the sfp with sfp_cleanup() when devm_add_action() fails.
>
> Signed-off-by: Jianglei Nie <[email protected]>
> ---
> drivers/net/phy/sfp.c | 4 +++-
> 1 file changed, 3 insertions(+), 1 deletion(-)
>
> diff --git a/drivers/net/phy/sfp.c b/drivers/net/phy/sfp.c
> index 9a5d5a10560f..366a89adabf5 100644
> --- a/drivers/net/phy/sfp.c
> +++ b/drivers/net/phy/sfp.c
> @@ -2517,8 +2517,10 @@ static int sfp_probe(struct platform_device *pdev)
> platform_set_drvdata(pdev, sfp);
>
> err = devm_add_action(sfp->dev, sfp_cleanup, sfp);
> - if (err < 0)
> + if (err < 0) {
> + sfp_cleanup(sfp);
> return err;
> + }

Hi,

or use devm_add_action_or_reset() instead?

Just my 2c,

CJ

>
> sff = sfp->type = &sfp_data;
>

2022-06-23 20:04:25

by Jakub Kicinski

Subject: Re: [PATCH] net: sfp: fix memory leak in sfp_probe()

On Thu, 23 Jun 2022 15:09:14 +0800 Jianglei Nie wrote:
> sfp_probe() allocates a memory chunk from sfp with sfp_alloc(), when
> devm_add_action() fails, sfp is not freed, which leads to a memory leak.
>
> We should free the sfp with sfp_cleanup() when devm_add_action() fails.

.. and please add a Fixes tag