Re: [PATCH] drivers: uio_dmem_genirq: Fix memory leak in uio_dmem_genirq_probe()

From: Hans J. Koch
Date: Thu May 22 2014 - 10:50:40 EST


On Thu, May 22, 2014 at 09:46:12AM +0900, Daeseok Youn wrote:
> When platform_get_irq() is failed after "priv" allocated,
> it need to free "priv". But the label of bad0 doesn't try
> to free about "priv". So this patch changes that lable to "bad1".
> But "bad1" has pm_runtime_disable() call, this function should
> be called when uio_register_device() is failed. So it is moved
> into handling error for uio_register_device().

Looks alright to me. Thanks for your contribution.

Signed-off-by: Hans J. Koch <hjk@xxxxxxxxxxxx>

>
> Signed-off-by: Daeseok Youn <daeseok.youn@xxxxxxxxx>
> ---
> drivers/uio/uio_dmem_genirq.c | 4 ++--
> 1 files changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/uio/uio_dmem_genirq.c b/drivers/uio/uio_dmem_genirq.c
> index 1270f3b..8d0bba4 100644
> --- a/drivers/uio/uio_dmem_genirq.c
> +++ b/drivers/uio/uio_dmem_genirq.c
> @@ -204,7 +204,7 @@ static int uio_dmem_genirq_probe(struct platform_device *pdev)
> ret = platform_get_irq(pdev, 0);
> if (ret < 0) {
> dev_err(&pdev->dev, "failed to get IRQ\n");
> - goto bad0;
> + goto bad1;
> }
> uioinfo->irq = ret;
> }
> @@ -275,6 +275,7 @@ static int uio_dmem_genirq_probe(struct platform_device *pdev)
> ret = uio_register_device(&pdev->dev, priv->uioinfo);
> if (ret) {
> dev_err(&pdev->dev, "unable to register uio device\n");
> + pm_runtime_disable(&pdev->dev);
> goto bad1;
> }
>
> @@ -282,7 +283,6 @@ static int uio_dmem_genirq_probe(struct platform_device *pdev)
> return 0;
> bad1:
> kfree(priv);
> - pm_runtime_disable(&pdev->dev);
> bad0:
> /* kfree uioinfo for OF */
> if (pdev->dev.of_node)
> --
> 1.7.1
>
>
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/