* [PATCH] mtd: rawnand: jz4780: fix object reference leaks in jz4780_bch_get
@ 2019-02-05 9:36 wen yang
2019-02-05 13:30 ` Miquel Raynal
0 siblings, 1 reply; 2+ messages in thread
From: wen yang @ 2019-02-05 9:36 UTC (permalink / raw)
To: harveyhuntnexus, bbrezillon, miquel.raynal, richard, dwmw2,
computersforpeace, marek.vasut
Cc: alexandre.belloni, wen yang, nicolas.ferre, linux-kernel,
ludovic.desroches, linux-mtd
of_find_device_by_node() takes a reference to the struct device
when it finds a match via get_device, there is no need to call
get_device() twice.
We also should make sure to drop the reference to the device
taken by of_find_device_by_node() on driver unbind.
Fixes: ae02ab00aa3c ("mtd: nand: jz4780: driver for NAND devices on JZ4780 SoCs")
Signed-off-by: Wen Yang <yellowriver2010@hotmail.com>
Suggested-by: Boris Brezillon <bbrezillon@kernel.org>
Cc: Harvey Hunt <harveyhuntnexus@gmail.com>
Cc: Boris Brezillon <bbrezillon@kernel.org>
Cc: Miquel Raynal <miquel.raynal@bootlin.com>
Cc: Richard Weinberger <richard@nod.at>
Cc: David Woodhouse <dwmw2@infradead.org>
Cc: Brian Norris <computersforpeace@gmail.com>
Cc: Marek Vasut <marek.vasut@gmail.com>
Cc: linux-mtd@lists.infradead.org
Cc: linux-kernel@vger.kernel.org
---
drivers/mtd/nand/raw/jz4780_bch.c | 13 ++++++++++---
1 file changed, 10 insertions(+), 3 deletions(-)
diff --git a/drivers/mtd/nand/raw/jz4780_bch.c b/drivers/mtd/nand/raw/jz4780_bch.c
index 7201827..d0ce5de 100644
--- a/drivers/mtd/nand/raw/jz4780_bch.c
+++ b/drivers/mtd/nand/raw/jz4780_bch.c
@@ -279,17 +279,24 @@ static struct jz4780_bch *jz4780_bch_get(struct device_node *np)
{
struct platform_device *pdev;
struct jz4780_bch *bch;
+ int ret;
pdev = of_find_device_by_node(np);
- if (!pdev || !platform_get_drvdata(pdev))
+ if (!pdev)
return ERR_PTR(-EPROBE_DEFER);
-
- get_device(&pdev->dev);
+ if (!platform_get_drvdata(pdev)) {
+ ret = -EPROBE_DEFER;
+ goto err_put_device;
+ }
bch = platform_get_drvdata(pdev);
clk_prepare_enable(bch->clk);
return bch;
+
+err_put_device:
+ put_device(&pdev->dev);
+ return ERR_PTR(ret);
}
/**
--
2.7.4
______________________________________________________
Linux MTD discussion mailing list
http://lists.infradead.org/mailman/listinfo/linux-mtd/
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH] mtd: rawnand: jz4780: fix object reference leaks in jz4780_bch_get
2019-02-05 9:36 [PATCH] mtd: rawnand: jz4780: fix object reference leaks in jz4780_bch_get wen yang
@ 2019-02-05 13:30 ` Miquel Raynal
0 siblings, 0 replies; 2+ messages in thread
From: Miquel Raynal @ 2019-02-05 13:30 UTC (permalink / raw)
To: wen yang
Cc: alexandre.belloni, bbrezillon, richard, nicolas.ferre,
linux-kernel, marek.vasut, ludovic.desroches, harveyhuntnexus,
linux-mtd, computersforpeace, dwmw2
Hi wen,
wen yang <yellowriver2010@hotmail.com> wrote on Tue, 5 Feb 2019
09:36:48 +0000:
> of_find_device_by_node() takes a reference to the struct device
> when it finds a match via get_device, there is no need to call
> get_device() twice.
> We also should make sure to drop the reference to the device
> taken by of_find_device_by_node() on driver unbind.
>
> Fixes: ae02ab00aa3c ("mtd: nand: jz4780: driver for NAND devices on JZ4780 SoCs")
> Signed-off-by: Wen Yang <yellowriver2010@hotmail.com>
> Suggested-by: Boris Brezillon <bbrezillon@kernel.org>
> Cc: Harvey Hunt <harveyhuntnexus@gmail.com>
> Cc: Boris Brezillon <bbrezillon@kernel.org>
> Cc: Miquel Raynal <miquel.raynal@bootlin.com>
> Cc: Richard Weinberger <richard@nod.at>
> Cc: David Woodhouse <dwmw2@infradead.org>
> Cc: Brian Norris <computersforpeace@gmail.com>
> Cc: Marek Vasut <marek.vasut@gmail.com>
> Cc: linux-mtd@lists.infradead.org
> Cc: linux-kernel@vger.kernel.org
> ---
> drivers/mtd/nand/raw/jz4780_bch.c | 13 ++++++++++---
> 1 file changed, 10 insertions(+), 3 deletions(-)
>
> diff --git a/drivers/mtd/nand/raw/jz4780_bch.c b/drivers/mtd/nand/raw/jz4780_bch.c
> index 7201827..d0ce5de 100644
> --- a/drivers/mtd/nand/raw/jz4780_bch.c
> +++ b/drivers/mtd/nand/raw/jz4780_bch.c
> @@ -279,17 +279,24 @@ static struct jz4780_bch *jz4780_bch_get(struct device_node *np)
> {
> struct platform_device *pdev;
> struct jz4780_bch *bch;
> + int ret;
>
> pdev = of_find_device_by_node(np);
> - if (!pdev || !platform_get_drvdata(pdev))
> + if (!pdev)
> return ERR_PTR(-EPROBE_DEFER);
> -
> - get_device(&pdev->dev);
> + if (!platform_get_drvdata(pdev)) {
> + ret = -EPROBE_DEFER;
> + goto err_put_device;
> + }
>
> bch = platform_get_drvdata(pdev);
> clk_prepare_enable(bch->clk);
>
> return bch;
> +
> +err_put_device:
> + put_device(&pdev->dev);
> + return ERR_PTR(ret);
While there is only one user of this label, I think we don't want it.
Thanks,
Miquèl
______________________________________________________
Linux MTD discussion mailing list
http://lists.infradead.org/mailman/listinfo/linux-mtd/
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2019-02-05 13:30 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2019-02-05 9:36 [PATCH] mtd: rawnand: jz4780: fix object reference leaks in jz4780_bch_get wen yang
2019-02-05 13:30 ` Miquel Raynal
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).