2020-08-24 06:01:11

by Dinghao Liu

Subject: [PATCH] net: systemport: Fix memleak in bcm_sysport_probe

When devm_kcalloc() fails, dev should be freed just
like what we've done in the subsequent error paths.

Fixes: 7b78be48a8eb6 ("net: systemport: Dynamically allocate number of TX rings")
Signed-off-by: Dinghao Liu <[email protected]>
---
drivers/net/ethernet/broadcom/bcmsysport.c | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/drivers/net/ethernet/broadcom/bcmsysport.c b/drivers/net/ethernet/broadcom/bcmsysport.c
index dfed9ade6950..0762d5d1a810 100644
--- a/drivers/net/ethernet/broadcom/bcmsysport.c
+++ b/drivers/net/ethernet/broadcom/bcmsysport.c
@@ -2491,8 +2491,10 @@ static int bcm_sysport_probe(struct platform_device *pdev)
priv->tx_rings = devm_kcalloc(&pdev->dev, txq,
sizeof(struct bcm_sysport_tx_ring),
GFP_KERNEL);
- if (!priv->tx_rings)
- return -ENOMEM;
+ if (!priv->tx_rings) {
+ ret = -ENOMEM;
+ goto err_free_netdev;
+ }

priv->is_lite = params->is_lite;
priv->num_rx_desc_words = params->num_rx_desc_words;
--
2.17.1

2020-08-24 13:01:33

by David Miller

Subject: Re: [PATCH] net: systemport: Fix memleak in bcm_sysport_probe

From: Dinghao Liu <[email protected]>
Date: Mon, 24 Aug 2020 13:58:31 +0800

> When devm_kcalloc() fails, dev should be freed just
> like what we've done in the subsequent error paths.
>
> Fixes: 7b78be48a8eb6 ("net: systemport: Dynamically allocate number of TX rings")
> Signed-off-by: Dinghao Liu <[email protected]>

Applied and queued up for -stable, thanks.

2020-08-24 15:33:52

by Florian Fainelli

Subject: Re: [PATCH] net: systemport: Fix memleak in bcm_sysport_probe

On 8/23/2020 10:58 PM, Dinghao Liu wrote:
> When devm_kcalloc() fails, dev should be freed just
> like what we've done in the subsequent error paths.
>
> Fixes: 7b78be48a8eb6 ("net: systemport: Dynamically allocate number of TX rings")
> Signed-off-by: Dinghao Liu <[email protected]>

Acked-by: Florian Fainelli <[email protected]>

This has already been applied, but this is good.
--
Florian