summary refs log tree commit diff
path: root/drivers/mtd/nand
diff options
context:
space:
mode:
authorWen Yang <yellowriver2010@hotmail.com>2019-02-07 14:01:23 +0000
committerMiquel Raynal <miquel.raynal@bootlin.com>2019-02-07 23:14:14 +0100
commit11493f26856a6098de6fe2d93e9eefebca3e31d6 (patch)
tree0604b7502f5b7e352f329384fef7cb45e00e32f7 /drivers/mtd/nand
parenta12085d13997ed15f745f33a0e01002541160179 (diff)
downloadlinux-11493f26856a6098de6fe2d93e9eefebca3e31d6.tar.gz
mtd: rawnand: jz4780: fix possible object reference leak
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>
Signed-off-by: Miquel Raynal <miquel.raynal@bootlin.com>
Diffstat (limited to 'drivers/mtd/nand')
-rw-r--r--drivers/mtd/nand/raw/jz4780_bch.c9
1 files changed, 6 insertions, 3 deletions
diff --git a/drivers/mtd/nand/raw/jz4780_bch.c b/drivers/mtd/nand/raw/jz4780_bch.c
index 7201827809e9..c5f74ed85862 100644
--- a/drivers/mtd/nand/raw/jz4780_bch.c
+++ b/drivers/mtd/nand/raw/jz4780_bch.c
@@ -281,12 +281,15 @@ 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;