iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

can: ti_hecc: Fix memleak in ti_hecc_probe

Browse Source 
In the error handling, we should goto the probe_exit_candev
to free ndev to prevent memory leak.

Fixes: dabf54dd1c63 ("can: ti_hecc: Convert TI HECC driver to DT only driver")
Signed-off-by: Zhang Qilong <zhangqilong3@huawei.com>
Link: https://lore.kernel.org/r/20201114111708.3465543-1-zhangqilong3@huawei.com
Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
This commit is contained in:
Zhang Qilong 2020-11-14 19:17:08 +08:00 committed by Marc Kleine-Budde
parent a1e654070a
commit 7968c7c79d
1 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
drivers/net/can/ti_hecc.c
View File

@ -881,7 +881,8 @@ static int ti_hecc_probe(struct platform_device *pdev)
priv->base = devm_platform_ioremap_resource_byname(pdev, "hecc"); priv->base = devm_platform_ioremap_resource_byname(pdev, "hecc");
if (IS_ERR(priv->base)) { if (IS_ERR(priv->base)) {
dev_err(&pdev->dev, "hecc ioremap failed\n"); dev_err(&pdev->dev, "hecc ioremap failed\n");
return PTR_ERR(priv->base); err = PTR_ERR(priv->base);
goto probe_exit_candev;
} }
/* handle hecc-ram memory */ /* handle hecc-ram memory */
@ -889,20 +890,22 @@ static int ti_hecc_probe(struct platform_device *pdev)
"hecc-ram"); "hecc-ram");
if (IS_ERR(priv->hecc_ram)) { if (IS_ERR(priv->hecc_ram)) {
dev_err(&pdev->dev, "hecc-ram ioremap failed\n"); dev_err(&pdev->dev, "hecc-ram ioremap failed\n");
return PTR_ERR(priv->hecc_ram); err = PTR_ERR(priv->hecc_ram);
goto probe_exit_candev;
} }
/* handle mbx memory */ /* handle mbx memory */
priv->mbx = devm_platform_ioremap_resource_byname(pdev, "mbx"); priv->mbx = devm_platform_ioremap_resource_byname(pdev, "mbx");
if (IS_ERR(priv->mbx)) { if (IS_ERR(priv->mbx)) {
dev_err(&pdev->dev, "mbx ioremap failed\n"); dev_err(&pdev->dev, "mbx ioremap failed\n");
return PTR_ERR(priv->mbx); err = PTR_ERR(priv->mbx);
goto probe_exit_candev;
} }
irq = platform_get_resource(pdev, IORESOURCE_IRQ, 0); irq = platform_get_resource(pdev, IORESOURCE_IRQ, 0);
if (!irq) { if (!irq) {
dev_err(&pdev->dev, "No irq resource\n"); dev_err(&pdev->dev, "No irq resource\n");
goto probe_exit; goto probe_exit_candev;
} }
priv->ndev = ndev; priv->ndev = ndev;
@ -966,7 +969,7 @@ probe_exit_release_clk:
clk_put(priv->clk); clk_put(priv->clk);
probe_exit_candev: probe_exit_candev:
free_candev(ndev); free_candev(ndev);
probe_exit:
return err; return err;
} }