| Message ID | 20200824055831.26745-1-dinghao.liu@zju.edu.cn |
|---|---|
| State | Accepted |
| Delegated to: | David Miller |
| Headers | show |
| Series | net: systemport: Fix memleak in bcm_sysport_probe | expand |
From: Dinghao Liu <dinghao.liu@zju.edu.cn> 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 <dinghao.liu@zju.edu.cn> Applied and queued up for -stable, thanks.
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 <dinghao.liu@zju.edu.cn> Acked-by: Florian Fainelli <f.fainelli@gmail.com> This has already been applied, but this is good.
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;
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 <dinghao.liu@zju.edu.cn> --- drivers/net/ethernet/broadcom/bcmsysport.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-)