nagai/kernel
3
0
Fork 0
forked from mirrors/linux
Code Pull requests Activity

mtd: rawnand: atmel: fix possible object reference leak

Browse source 
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: f88fc122cc ("mtd: nand: Cleanup/rework the atmel_nand driver")
Signed-off-by: Wen Yang <yellowriver2010@hotmail.com>
Suggested-by: Boris Brezillon <bbrezillon@kernel.org>
Reviewed-by: Boris Brezillon <bbrezillon@kernel.org>
Reviewed-by: Miquel Raynal <miquel.raynal@bootlin.com>
Acked-by: Miquel Raynal <miquel.raynal@bootlin.com>
Cc: Tudor Ambarus <tudor.ambarus@microchip.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: Nicolas Ferre <nicolas.ferre@microchip.com>
Cc: Alexandre Belloni <alexandre.belloni@bootlin.com>
Cc: Ludovic Desroches <ludovic.desroches@microchip.com>
Cc: linux-mtd@lists.infradead.org
Cc: linux-arm-kernel@lists.infradead.org
Cc: linux-kernel@vger.kernel.org
Signed-off-by: Miquel Raynal <miquel.raynal@bootlin.com>
This commit is contained in:
Wen Yang 2019-02-07 03:50:55 +00:00 committed by Miquel Raynal
parent ab3ab7b654
commit a12085d139
1 changed files with 15 additions and 6 deletions
repo.diff.show_diff_stats Download patch file Download diff file Expand all files Collapse all files

21
drivers/mtd/nand/raw/atmel/pmecc.c
View file

@ -876,23 +876,32 @@ static struct atmel_pmecc *atmel_pmecc_get_by_node(struct device *userdev,
{ {
struct platform_device *pdev; struct platform_device *pdev;
struct atmel_pmecc *pmecc, **ptr; struct atmel_pmecc *pmecc, **ptr;
int ret;
pdev = of_find_device_by_node(np); pdev = of_find_device_by_node(np);
if (!pdev || !platform_get_drvdata(pdev)) if (!pdev)
return ERR_PTR(-EPROBE_DEFER); return ERR_PTR(-EPROBE_DEFER);
pmecc = platform_get_drvdata(pdev);
if (!pmecc) {
ret = -EPROBE_DEFER;
goto err_put_device;
}
ptr = devres_alloc(devm_atmel_pmecc_put, sizeof(*ptr), GFP_KERNEL); ptr = devres_alloc(devm_atmel_pmecc_put, sizeof(*ptr), GFP_KERNEL);
if (!ptr) if (!ptr) {
return ERR_PTR(-ENOMEM); ret = -ENOMEM;
goto err_put_device;
get_device(&pdev->dev); }
pmecc = platform_get_drvdata(pdev);
*ptr = pmecc; *ptr = pmecc;
devres_add(userdev, ptr); devres_add(userdev, ptr);
return pmecc; return pmecc;
err_put_device:
put_device(&pdev->dev);
return ERR_PTR(ret);
} }
static const int atmel_pmecc_strengths[] = { 2, 4, 8, 12, 24, 32 }; static const int atmel_pmecc_strengths[] = { 2, 4, 8, 12, 24, 32 };