mirror of https://lore.kernel.org/lkml/
 help / color / mirror / Atom feed
From: Andrzej Pietrasiewicz <andrzej.p@collabora.com>
To: Yi Yang <yiyang13@huawei.com>,
	linus.walleij@linaro.org, gregkh@linuxfoundation.org
Cc: linux-usb@vger.kernel.org, linux-kernel@vger.kernel.org
Subject: Re: [PATCH] usb: fotg210-udc: fix potential memory leak in fotg210_udc_probe()
Date: Thu, 1 Dec 2022 10:38:11 +0100	[thread overview]
Message-ID: <c21591d1-7462-974e-3171-e23a0fbd7ddb@collabora.com> (raw)
In-Reply-To: <20221130101251.245399-1-yiyang13@huawei.com>

Hi Yi Yang,

You can make your patch also simplify the code.

Earlier, there's

	ret = -ENOMEM;

	/* initialize udc */
	fotg210 = kzalloc(sizeof(struct fotg210_udc), GFP_KERNEL);
	if (fotg210 == NULL)
		goto err;

and the code at the "err" label before your changes merely returns "ret".
Instead of "goto err" return -ENOMEM can be used. This, in turn,
eliminates the ret = -ENOMEM assignment. Furthermore, after applying your
patch as-is, the said "goto err;" will result with kfree(NULL) which is safe,
but unnecessary.

If you include the above changes you can add my

Reviewed-by: Andrzej Pietrasiewicz <andrzej.p@collabora.com>

W dniu 30.11.2022 o 11:12, Yi Yang pisze:
> In fotg210_udc_probe(), if devm_clk_get() or clk_prepare_enable()
> fails, 'fotg210' will not be freed, which will lead to a memory leak.
> Fix it by moving kfree() to a proper location.
> 
> Fixes: 718a38d092ec ("fotg210-udc: Handle PCLK")
> Signed-off-by: Yi Yang <yiyang13@huawei.com>
> ---
>   drivers/usb/fotg210/fotg210-udc.c | 5 ++---
>   1 file changed, 2 insertions(+), 3 deletions(-)
> 
> diff --git a/drivers/usb/fotg210/fotg210-udc.c b/drivers/usb/fotg210/fotg210-udc.c
> index b9ea6c6d931c..a366d69c1818 100644
> --- a/drivers/usb/fotg210/fotg210-udc.c
> +++ b/drivers/usb/fotg210/fotg210-udc.c
> @@ -1178,7 +1178,7 @@ int fotg210_udc_probe(struct platform_device *pdev)
>   		ret = clk_prepare_enable(fotg210->pclk);
>   		if (ret) {
>   			dev_err(dev, "failed to enable PCLK\n");
> -			return ret;
> +			goto err;
>   		}
>   	} else if (PTR_ERR(fotg210->pclk) == -EPROBE_DEFER) {
>   		/*
> @@ -1302,8 +1302,7 @@ int fotg210_udc_probe(struct platform_device *pdev)
>   	if (!IS_ERR(fotg210->pclk))
>   		clk_disable_unprepare(fotg210->pclk);
>   
> -	kfree(fotg210);
> -
>   err:
> +	kfree(fotg210);
>   	return ret;
>   }


  reply	other threads:[~2022-12-01  9:38 UTC|newest]

Thread overview: 3+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2022-11-30 10:12 Yi Yang
2022-12-01  9:38 ` Andrzej Pietrasiewicz [this message]
2022-12-04 18:19 ` Linus Walleij

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=c21591d1-7462-974e-3171-e23a0fbd7ddb@collabora.com \
    --to=andrzej.p@collabora.com \
    --cc=gregkh@linuxfoundation.org \
    --cc=linus.walleij@linaro.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-usb@vger.kernel.org \
    --cc=yiyang13@huawei.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox

all inboxes | Powered by JetHome®