* [PATCH v2] mtd: rawnand: jz4780: fix possible object reference leak
@ 2019-02-05 15:07 Wen Yang
2019-02-05 15:55 ` Miquel Raynal
0 siblings, 1 reply; 3+ messages in thread
From: Wen Yang @ 2019-02-05 15:07 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: Miquel Raynal <miquel.raynal@bootlin.com>
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
---
v2->v1: Since there is the only one user, let's remove the err_put_device label.
drivers/mtd/nand/raw/jz4780_bch.c | 8 +++++---
1 file changed, 5 insertions(+), 3 deletions(-)
diff --git a/drivers/mtd/nand/raw/jz4780_bch.c b/drivers/mtd/nand/raw/jz4780_bch.c
index 7201827..363465c 100644
--- a/drivers/mtd/nand/raw/jz4780_bch.c
+++ b/drivers/mtd/nand/raw/jz4780_bch.c
@@ -281,10 +281,12 @@ static struct jz4780_bch *jz4780_bch_get(struct device_node *np)
struct jz4780_bch *bch;
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)) {
+ put_device(&pdev->dev);
+ return ERR_PTR(-EPROBE_DEFER);
+ }
bch = platform_get_drvdata(pdev);
clk_prepare_enable(bch->clk);
--
2.7.4
______________________________________________________
Linux MTD discussion mailing list
http://lists.infradead.org/mailman/listinfo/linux-mtd/
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [PATCH v2] mtd: rawnand: jz4780: fix possible object reference leak
2019-02-05 15:07 [PATCH v2] mtd: rawnand: jz4780: fix possible object reference leak Wen Yang
@ 2019-02-05 15:55 ` Miquel Raynal
2019-02-05 16:21 ` Boris Brezillon
0 siblings, 1 reply; 3+ messages in thread
From: Miquel Raynal @ 2019-02-05 15:55 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
15:07:21 +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: Miquel Raynal <miquel.raynal@bootlin.com>
> 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
> ---
> v2->v1: Since there is the only one user, let's remove the err_put_device label.
>
> drivers/mtd/nand/raw/jz4780_bch.c | 8 +++++---
> 1 file changed, 5 insertions(+), 3 deletions(-)
>
> diff --git a/drivers/mtd/nand/raw/jz4780_bch.c b/drivers/mtd/nand/raw/jz4780_bch.c
> index 7201827..363465c 100644
> --- a/drivers/mtd/nand/raw/jz4780_bch.c
> +++ b/drivers/mtd/nand/raw/jz4780_bch.c
> @@ -281,10 +281,12 @@ static struct jz4780_bch *jz4780_bch_get(struct device_node *np)
> struct jz4780_bch *bch;
>
> 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)) {
> + put_device(&pdev->dev);
> + return ERR_PTR(-EPROBE_DEFER);
> + }
>
> bch = platform_get_drvdata(pdev);
> clk_prepare_enable(bch->clk);
Acked-by: Miquel Raynal <miquel.raynal@bootlin.com>
Thanks,
Miquèl
______________________________________________________
Linux MTD discussion mailing list
http://lists.infradead.org/mailman/listinfo/linux-mtd/
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH v2] mtd: rawnand: jz4780: fix possible object reference leak
2019-02-05 15:55 ` Miquel Raynal
@ 2019-02-05 16:21 ` Boris Brezillon
0 siblings, 0 replies; 3+ messages in thread
From: Boris Brezillon @ 2019-02-05 16:21 UTC (permalink / raw)
To: Miquel Raynal
Cc: alexandre.belloni, Wen Yang, nicolas.ferre, linux-kernel,
marek.vasut, ludovic.desroches, harveyhuntnexus, linux-mtd,
richard, computersforpeace, dwmw2
On Tue, 5 Feb 2019 16:55:02 +0100
Miquel Raynal <miquel.raynal@bootlin.com> wrote:
> Hi Wen,
>
> Wen Yang <yellowriver2010@hotmail.com> wrote on Tue, 5 Feb 2019
> 15:07:21 +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: Miquel Raynal <miquel.raynal@bootlin.com>
> > 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
> > ---
> > v2->v1: Since there is the only one user, let's remove the
> > err_put_device label.
> >
> > drivers/mtd/nand/raw/jz4780_bch.c | 8 +++++---
> > 1 file changed, 5 insertions(+), 3 deletions(-)
> >
> > diff --git a/drivers/mtd/nand/raw/jz4780_bch.c
> > b/drivers/mtd/nand/raw/jz4780_bch.c index 7201827..363465c 100644
> > --- a/drivers/mtd/nand/raw/jz4780_bch.c
> > +++ b/drivers/mtd/nand/raw/jz4780_bch.c
> > @@ -281,10 +281,12 @@ static struct jz4780_bch
> > *jz4780_bch_get(struct device_node *np) struct jz4780_bch *bch;
> >
> > 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)) {
> > + put_device(&pdev->dev);
> > + return ERR_PTR(-EPROBE_DEFER);
> > + }
> >
> > bch = platform_get_drvdata(pdev);
> > clk_prepare_enable(bch->clk);
>
> Acked-by: Miquel Raynal <miquel.raynal@bootlin.com>
Don't plan to take that one (or any other ref leak fix) in the mtd/fixes
branch, feel free to queue it to nand/next.
______________________________________________________
Linux MTD discussion mailing list
http://lists.infradead.org/mailman/listinfo/linux-mtd/
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2019-02-05 16:21 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2019-02-05 15:07 [PATCH v2] mtd: rawnand: jz4780: fix possible object reference leak Wen Yang
2019-02-05 15:55 ` Miquel Raynal
2019-02-05 16:21 ` Boris Brezillon
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).