[<prev] [next>] [day] [month] [year] [list]
Message-ID: <20190205143106.751554e0@xps13>
Date: Tue, 5 Feb 2019 14:31:06 +0100
From: Miquel Raynal <miquel.raynal@...tlin.com>
To: wen yang <yellowriver2010@...mail.com>
Cc: "xiaolei.li@...iatek.com" <xiaolei.li@...iatek.com>,
"bbrezillon@...nel.org" <bbrezillon@...nel.org>,
"richard@....at" <richard@....at>,
"dwmw2@...radead.org" <dwmw2@...radead.org>,
"computersforpeace@...il.com" <computersforpeace@...il.com>,
"marek.vasut@...il.com" <marek.vasut@...il.com>,
"matthias.bgg@...il.com" <matthias.bgg@...il.com>,
"ludovic.desroches@...rochip.com" <ludovic.desroches@...rochip.com>,
"linux-mtd@...ts.infradead.org" <linux-mtd@...ts.infradead.org>,
"linux-arm-kernel@...ts.infradead.org"
<linux-arm-kernel@...ts.infradead.org>,
"linux-mediatek@...ts.infradead.org"
<linux-mediatek@...ts.infradead.org>,
"linux-kernel@...r.kernel.org" <linux-kernel@...r.kernel.org>
Subject: Re: [PATCH] mtd: rawnand: mtk: fix object reference leaks in
mtk_ecc_get
Hi wen,
wen yang <yellowriver2010@...mail.com> wrote on Tue, 5 Feb 2019
10:05:46 +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: 1d6b1e464950 ("mtd: mediatek: driver for MTK Smart Device")
> Signed-off-by: Wen Yang <yellowriver2010@...mail.com>
> Suggested-by: Boris Brezillon <bbrezillon@...nel.org>
> Cc: Xiaolei Li <xiaolei.li@...iatek.com>
> Cc: Boris Brezillon <bbrezillon@...nel.org>
> Cc: Miquel Raynal <miquel.raynal@...tlin.com>
> Cc: Richard Weinberger <richard@....at>
> Cc: David Woodhouse <dwmw2@...radead.org>
> Cc: Brian Norris <computersforpeace@...il.com>
> Cc: Marek Vasut <marek.vasut@...il.com>
> Cc: Matthias Brugger <matthias.bgg@...il.com>
> Cc: linux-mtd@...ts.infradead.org
> Cc: linux-arm-kernel@...ts.infradead.org
> Cc: linux-mediatek@...ts.infradead.org
> Cc: linux-kernel@...r.kernel.org
> ---
> drivers/mtd/nand/raw/mtk_ecc.c | 12 ++++++++++--
> 1 file changed, 10 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/mtd/nand/raw/mtk_ecc.c b/drivers/mtd/nand/raw/mtk_ecc.c
> index 6432bd7..25bdc15 100644
> --- a/drivers/mtd/nand/raw/mtk_ecc.c
> +++ b/drivers/mtd/nand/raw/mtk_ecc.c
> @@ -265,17 +265,25 @@ static struct mtk_ecc *mtk_ecc_get(struct device_node *np)
> {
> struct platform_device *pdev;
> struct mtk_ecc *ecc;
> + 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;
> + }
>
> - get_device(&pdev->dev);
> ecc = platform_get_drvdata(pdev);
> clk_prepare_enable(ecc->clk);
> mtk_ecc_hw_init(ecc);
>
> return ecc;
> +
> +err_put_device:
> + put_device(&pdev->dev);
> + return ERR_PTR(ret);
Same as before, I don't think a label is useful in this situation.
Thanks,
Miquèl
Powered by blists - more mailing lists