Re: [PATCH v2] mtd: rawnand: jz4780: fix possible object reference leak

Re: [PATCH v2] mtd: rawnand: jz4780: fix possible object reference leak

[Miquel Raynal]

Hi Wen,

Wen Yang <yellowriver2010@hotmail.com> wrote on Tue, 5 Feb 2019
15:07:21 +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>
> Suggested-by: Miquel Raynal <miquel.raynal@bootlin.com>
> Cc: Harvey Hunt <harveyhuntnexus@gmail.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: linux-mtd@lists.infradead.org
> Cc: linux-kernel@vger.kernel.org
> ---
> v2->v1: Since there is the only one user, let's remove the err_put_device label.
> 
>  drivers/mtd/nand/raw/jz4780_bch.c | 8 +++++---
>  1 file changed, 5 insertions(+), 3 deletions(-)
> 
> diff --git a/drivers/mtd/nand/raw/jz4780_bch.c b/drivers/mtd/nand/raw/jz4780_bch.c
> index 7201827..363465c 100644
> --- a/drivers/mtd/nand/raw/jz4780_bch.c
> +++ b/drivers/mtd/nand/raw/jz4780_bch.c
> @@ -281,10 +281,12 @@ 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);
> +	if (!platform_get_drvdata(pdev)) {
> +		put_device(&pdev->dev);
> +		return ERR_PTR(-EPROBE_DEFER);
> +	}
>  
>  	bch = platform_get_drvdata(pdev);
>  	clk_prepare_enable(bch->clk);

Acked-by: Miquel Raynal <miquel.raynal@bootlin.com>


Thanks,
Miquèl

Re: [PATCH v2] mtd: rawnand: jz4780: fix possible object reference leak

[Boris Brezillon]

On Tue, 5 Feb 2019 16:55:02 +0100
Miquel Raynal <miquel.raynal@bootlin.com> wrote:

> Hi Wen,
> 
> Wen Yang <yellowriver2010@hotmail.com> wrote on Tue, 5 Feb 2019
> 15:07:21 +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>
> > Suggested-by: Miquel Raynal <miquel.raynal@bootlin.com>
> > Cc: Harvey Hunt <harveyhuntnexus@gmail.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: linux-mtd@lists.infradead.org
> > Cc: linux-kernel@vger.kernel.org
> > ---
> > v2->v1: Since there is the only one user, let's remove the
> > err_put_device label.
> > 
> >  drivers/mtd/nand/raw/jz4780_bch.c | 8 +++++---
> >  1 file changed, 5 insertions(+), 3 deletions(-)
> > 
> > diff --git a/drivers/mtd/nand/raw/jz4780_bch.c
> > b/drivers/mtd/nand/raw/jz4780_bch.c index 7201827..363465c 100644
> > --- a/drivers/mtd/nand/raw/jz4780_bch.c
> > +++ b/drivers/mtd/nand/raw/jz4780_bch.c
> > @@ -281,10 +281,12 @@ 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);
> > +	if (!platform_get_drvdata(pdev)) {
> > +		put_device(&pdev->dev);
> > +		return ERR_PTR(-EPROBE_DEFER);
> > +	}
> >  
> >  	bch = platform_get_drvdata(pdev);
> >  	clk_prepare_enable(bch->clk);  
> 
> Acked-by: Miquel Raynal <miquel.raynal@bootlin.com>

Don't plan to take that one (or any other ref leak fix) in the mtd/fixes
branch, feel free to queue it to nand/next.