linux-arm-kernel.lists.infradead.org archive mirror
 help / color / mirror / Atom feed
From: boris.brezillon@bootlin.com (Boris Brezillon)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH v2] mtd: nxp-spifi: release flash_np in nxp_spifi_probe()
Date: Wed, 9 May 2018 17:03:10 +0200	[thread overview]
Message-ID: <20180509170310.65d19c49@bbrezillon> (raw)
In-Reply-To: <1525877806-21148-1-git-send-email-khoroshilov@ispras.ru>

On Wed,  9 May 2018 17:56:46 +0300
Alexey Khoroshilov <khoroshilov@ispras.ru> wrote:

> nxp_spifi_probe() increments refcnt of SPI flash device node by
> of_get_next_available_child() and leaves it undecremented on both
> successful and error paths.
> 
> Found by Linux Driver Verification project (linuxtesting.org).
> 
> Signed-off-by: Alexey Khoroshilov <khoroshilov@ispras.ru>
> ---
>  drivers/mtd/spi-nor/nxp-spifi.c | 6 +++++-
>  1 file changed, 5 insertions(+), 1 deletion(-)
> 
> diff --git a/drivers/mtd/spi-nor/nxp-spifi.c b/drivers/mtd/spi-nor/nxp-spifi.c
> index 15374216d4d9..7b047951d0a2 100644
> --- a/drivers/mtd/spi-nor/nxp-spifi.c
> +++ b/drivers/mtd/spi-nor/nxp-spifi.c
> @@ -438,11 +438,15 @@ static int nxp_spifi_probe(struct platform_device *pdev)
>  	ret = nxp_spifi_setup_flash(spifi, flash_np);

Just put the of_node_put() here and that's the only change you'll need.

>  	if (ret) {
>  		dev_err(&pdev->dev, "unable to setup flash chip\n");
> -		goto dis_clks;
> +		goto put_np;
>  	}
>  
> +	of_node_put(flash_np);
> +
>  	return 0;
>  
> +put_np:
> +	of_node_put(flash_np);
>  dis_clks:
>  	clk_disable_unprepare(spifi->clk_spifi);
>  dis_clk_reg:

  reply	other threads:[~2018-05-09 15:03 UTC|newest]

Thread overview: 8+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2018-05-08 20:47 [PATCH] mtd: nxp-spifi: decrement flash_np refcnt on error paths Alexey Khoroshilov
2018-05-09  9:42 ` Boris Brezillon
2018-05-09 14:35   ` Alexey Khoroshilov
2018-05-09 14:39     ` Boris Brezillon
2018-05-09 14:56       ` [PATCH v2] mtd: nxp-spifi: release flash_np in nxp_spifi_probe() Alexey Khoroshilov
2018-05-09 15:03         ` Boris Brezillon [this message]
2018-05-09 15:11           ` [PATCH v3] " Alexey Khoroshilov
2018-07-07  6:58             ` Boris Brezillon

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=20180509170310.65d19c49@bbrezillon \
    --to=boris.brezillon@bootlin.com \
    --cc=linux-arm-kernel@lists.infradead.org \
    /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;
as well as URLs for NNTP newsgroup(s).