Hi wen,

Can you change the commit message:

"mtd: rawnand: atmel: fix possible object reference leak"

wen yang <[email protected]> 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 <[email protected]>
> Suggested-by: Boris Brezillon <[email protected]>
> Reviewed-by: Boris Brezillon <[email protected]>

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 <[email protected]>


Thanks,
Miquèl

Reply via email to