* [PATCH v2] mtd: nand: fix object reference leaks in atmel_pmecc_get_by_node
@ 2019-02-03 12:41 wen yang
2019-02-05 13:17 ` Miquel Raynal
0 siblings, 1 reply; 2+ messages in thread
From: wen yang @ 2019-02-03 12:41 UTC (permalink / raw)
To: tudor.ambarus, bbrezillon, miquel.raynal, 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: f88fc122cc34 ("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>
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
---
drivers/mtd/nand/raw/atmel/pmecc.c | 18 ++++++++++++++----
1 file changed, 14 insertions(+), 4 deletions(-)
diff --git a/drivers/mtd/nand/raw/atmel/pmecc.c b/drivers/mtd/nand/raw/atmel/pmecc.c
index 555a74e..1477368 100644
--- a/drivers/mtd/nand/raw/atmel/pmecc.c
+++ b/drivers/mtd/nand/raw/atmel/pmecc.c
@@ -876,16 +876,22 @@ static struct atmel_pmecc *atmel_pmecc_get_by_node(struct device *userdev,
{
struct platform_device *pdev;
struct atmel_pmecc *pmecc, **ptr;
+ int ret;
pdev = of_find_device_by_node(np);
- if (!pdev || !platform_get_drvdata(pdev))
+ if (!pdev)
return ERR_PTR(-EPROBE_DEFER);
+ if (!platform_get_drvdata(pdev)) {
+ ret = -EPROBE_DEFER;
+ goto err_put_device;
+ }
ptr = devres_alloc(devm_atmel_pmecc_put, sizeof(*ptr), GFP_KERNEL);
- if (!ptr)
- return ERR_PTR(-ENOMEM);
+ if (!ptr) {
+ ret = -ENOMEM;
+ goto err_put_device;
+ }
- get_device(&pdev->dev);
pmecc = platform_get_drvdata(pdev);
*ptr = pmecc;
@@ -893,6 +899,10 @@ static struct atmel_pmecc *atmel_pmecc_get_by_node(struct device *userdev,
devres_add(userdev, ptr);
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 };
--
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 v2] mtd: nand: fix object reference leaks in atmel_pmecc_get_by_node
2019-02-03 12:41 [PATCH v2] mtd: nand: fix object reference leaks in atmel_pmecc_get_by_node wen yang
@ 2019-02-05 13:17 ` Miquel Raynal
0 siblings, 0 replies; 2+ messages in thread
From: Miquel Raynal @ 2019-02-05 13:17 UTC (permalink / raw)
To: wen yang
Cc: alexandre.belloni, bbrezillon, richard, tudor.ambarus,
nicolas.ferre, linux-kernel, marek.vasut, ludovic.desroches,
linux-mtd, computersforpeace, dwmw2, linux-arm-kernel
Hi wen,
Can you change the commit message:
"mtd: rawnand: atmel: fix possible object reference leak"
wen yang <yellowriver2010@hotmail.com> wrote on Sun, 3 Feb 2019
12:41:44 +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: f88fc122cc34 ("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>
Unless I am missing something, Boris didn't gave his R-b yet.
[...]
> diff --git a/drivers/mtd/nand/raw/atmel/pmecc.c b/drivers/mtd/nand/raw/atmel/pmecc.c
> index 555a74e..1477368 100644
> --- a/drivers/mtd/nand/raw/atmel/pmecc.c
> +++ b/drivers/mtd/nand/raw/atmel/pmecc.c
> @@ -876,16 +876,22 @@ static struct atmel_pmecc *atmel_pmecc_get_by_node(struct device *userdev,
> {
> struct platform_device *pdev;
> struct atmel_pmecc *pmecc, **ptr;
> + int ret;
>
> pdev = of_find_device_by_node(np);
> - if (!pdev || !platform_get_drvdata(pdev))
> + if (!pdev)
> return ERR_PTR(-EPROBE_DEFER);
> + if (!platform_get_drvdata(pdev)) {
> + ret = -EPROBE_DEFER;
> + goto err_put_device;
> + }
>
> ptr = devres_alloc(devm_atmel_pmecc_put, sizeof(*ptr), GFP_KERNEL);
> - if (!ptr)
> - return ERR_PTR(-ENOMEM);
> + if (!ptr) {
> + ret = -ENOMEM;
> + goto err_put_device;
> + }
>
> - get_device(&pdev->dev);
> pmecc = platform_get_drvdata(pdev);
>
> *ptr = pmecc;
> @@ -893,6 +899,10 @@ static struct atmel_pmecc *atmel_pmecc_get_by_node(struct device *userdev,
> devres_add(userdev, ptr);
>
> 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 };
With the commit title changed, you can add my
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] 2+ messages in thread
end of thread, other threads:[~2019-02-05 13:17 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2019-02-03 12:41 [PATCH v2] mtd: nand: fix object reference leaks in atmel_pmecc_get_by_node wen yang
2019-02-05 13:17 ` 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).