Linux-mtd Archive on lore.kernel.org
 help / Atom feed
* [PATCH v4 2/3] mtd: rawnand: jz4780: fix possible object reference leak
@ 2019-02-07 12:02 Wen Yang
  2019-02-07 12:53 ` Miquel Raynal
  0 siblings, 1 reply; 2+ messages in thread
From: Wen Yang @ 2019-02-07 12:02 UTC (permalink / raw)
  To: bbrezillon, miquel.raynal, tudor.ambarus, richard, dwmw2,
	computersforpeace, marek.vasut
  Cc: alexandre.belloni, Wen Yang, nicolas.ferre, linux-kernel,
	ludovic.desroches, linux-mtd, linux-arm-kernel

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>
---
v4->v3: Add people in Cc and remove all lines.
v3->v2: Avoid two times of calling grtform_get_drvdata()
v2->v1: Since there is the only one user, let's remove the err_put_device label.

 drivers/mtd/nand/raw/jz4780_bch.c | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/drivers/mtd/nand/raw/jz4780_bch.c b/drivers/mtd/nand/raw/jz4780_bch.c
index 7201827..7aab851 100644
--- a/drivers/mtd/nand/raw/jz4780_bch.c
+++ b/drivers/mtd/nand/raw/jz4780_bch.c
@@ -281,12 +281,14 @@ 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);
-
 	bch = platform_get_drvdata(pdev);
+	if (!bch) {
+		put_device(&pdev->dev);
+		return ERR_PTR(-EPROBE_DEFER);
+	}
+
 	clk_prepare_enable(bch->clk);
 
 	return bch;
-- 
2.7.4


______________________________________________________
Linux MTD discussion mailing list
http://lists.infradead.org/mailman/listinfo/linux-mtd/

^ permalink raw reply	[flat|nested] 2+ messages in thread

* Re: [PATCH v4 2/3] mtd: rawnand: jz4780: fix possible object reference leak
  2019-02-07 12:02 [PATCH v4 2/3] mtd: rawnand: jz4780: fix possible object reference leak Wen Yang
@ 2019-02-07 12:53 ` Miquel Raynal
  0 siblings, 0 replies; 2+ messages in thread
From: Miquel Raynal @ 2019-02-07 12:53 UTC (permalink / raw)
  To: Wen Yang
  Cc: alexandre.belloni, tudor.ambarus, richard, bbrezillon,
	nicolas.ferre, linux-kernel, marek.vasut, ludovic.desroches,
	linux-mtd, computersforpeace, dwmw2, linux-arm-kernel

Hi Wen,

Wen Yang <yellowriver2010@hotmail.com> wrote on Thu, 7 Feb 2019
12:02:45 +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>
> ---
> v4->v3: Add people in Cc and remove all lines.
> v3->v2: Avoid two times of calling grtform_get_drvdata()
> v2->v1: Since there is the only one user, let's remove the err_put_device label.
> 
>  drivers/mtd/nand/raw/jz4780_bch.c | 10 ++++++----
>  1 file changed, 6 insertions(+), 4 deletions(-)
> 
> diff --git a/drivers/mtd/nand/raw/jz4780_bch.c b/drivers/mtd/nand/raw/jz4780_bch.c
> index 7201827..7aab851 100644
> --- a/drivers/mtd/nand/raw/jz4780_bch.c
> +++ b/drivers/mtd/nand/raw/jz4780_bch.c
> @@ -281,12 +281,14 @@ 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);
> -

Please keep one blank line here.

>  	bch = platform_get_drvdata(pdev);
> +	if (!bch) {
> +		put_device(&pdev->dev);
> +		return ERR_PTR(-EPROBE_DEFER);
> +	}
> +
>  	clk_prepare_enable(bch->clk);
>  
>  	return bch;


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, back to index

Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2019-02-07 12:02 [PATCH v4 2/3] mtd: rawnand: jz4780: fix possible object reference leak Wen Yang
2019-02-07 12:53 ` Miquel Raynal

Linux-mtd Archive on lore.kernel.org

Archives are clonable:
	git clone --mirror https://lore.kernel.org/linux-mtd/0 linux-mtd/git/0.git

	# If you have public-inbox 1.1+ installed, you may
	# initialize and index your mirror using the following commands:
	public-inbox-init -V2 linux-mtd linux-mtd/ https://lore.kernel.org/linux-mtd \
		linux-mtd@lists.infradead.org linux-mtd@archiver.kernel.org
	public-inbox-index linux-mtd


Newsgroup available over NNTP:
	nntp://nntp.lore.kernel.org/org.infradead.lists.linux-mtd


AGPL code for this site: git clone https://public-inbox.org/ public-inbox