From: Boris Brezillon <boris.brezillon@bootlin.com>
To: Miquel Raynal <miquel.raynal@bootlin.com>
Cc: Richard Weinberger <richard@nod.at>,
David Woodhouse <dwmw2@infradead.org>,
Brian Norris <computersforpeace@gmail.com>,
Marek Vasut <marek.vasut@gmail.com>,
Masahiro Yamada <yamada.masahiro@socionext.com>,
linux-mtd@lists.infradead.org, Kamal Dasu <kdasu.kdev@gmail.com>
Subject: Re: [PATCH v2 07/16] mtd: rawnand: fsl_ifc: fix probe function error path
Date: Tue, 27 Mar 2018 09:57:08 +0200 [thread overview]
Message-ID: <20180327095708.2ad361c9@bbrezillon> (raw)
In-Reply-To: <20180321130157.9524-8-miquel.raynal@bootlin.com>
On Wed, 21 Mar 2018 14:01:48 +0100
Miquel Raynal <miquel.raynal@bootlin.com> wrote:
> An error after nand_scan_tail() should trigger a nand_cleanup().
> The helper mtd_device_parse_register() returns an error code that should
> be checked and nand_cleanup() called accordingly.
>
> Signed-off-by: Miquel Raynal <miquel.raynal@bootlin.com>
> ---
> drivers/mtd/nand/raw/fsl_ifc_nand.c | 8 +++++++-
> 1 file changed, 7 insertions(+), 1 deletion(-)
>
> diff --git a/drivers/mtd/nand/raw/fsl_ifc_nand.c b/drivers/mtd/nand/raw/fsl_ifc_nand.c
> index 7ca678f05ae3..6082528ec7f1 100644
> --- a/drivers/mtd/nand/raw/fsl_ifc_nand.c
> +++ b/drivers/mtd/nand/raw/fsl_ifc_nand.c
> @@ -1065,14 +1065,20 @@ static int fsl_ifc_nand_probe(struct platform_device *dev)
>
> /* First look for RedBoot table or partitions on the command
> * line, these take precedence over device tree information */
> - mtd_device_parse_register(mtd, part_probe_types, NULL, NULL, 0);
> + ret = mtd_device_parse_register(mtd, part_probe_types, NULL, NULL, 0);
> + if (ret)
> + goto cleanup_nand;
>
> dev_info(priv->dev, "IFC NAND device at 0x%llx, bank %d\n",
> (unsigned long long)res.start, priv->bank);
> +
> return 0;
>
> +cleanup_nand:
> + nand_cleanup(&priv->chip);
> err:
> fsl_ifc_chip_remove(priv);
> +
Same as for the elbc patch: we might have double-free issues after this
change.
> return ret;
> }
>
--
Boris Brezillon, Bootlin (formerly Free Electrons)
Embedded Linux and Kernel engineering
https://bootlin.com
next prev parent reply other threads:[~2018-03-27 7:57 UTC|newest]
Thread overview: 26+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-03-21 13:01 [PATCH v2 00/16] Fix probe functions error path Miquel Raynal
2018-03-21 13:01 ` [PATCH v2 01/16] mtd: rawnand: brcmnand: fix probe function " Miquel Raynal
2018-03-21 13:01 ` [PATCH v2 02/16] mtd: rawnand: cafe: " Miquel Raynal
2018-03-27 8:02 ` Boris Brezillon
2018-03-21 13:01 ` [PATCH v2 03/16] mtd: rawnand: davinci: " Miquel Raynal
2018-03-21 13:01 ` [PATCH v2 04/16] mtd: rawnand: denali: " Miquel Raynal
2018-03-21 13:01 ` [PATCH v2 05/16] mtd: rawnand: docg4: fix the " Miquel Raynal
2018-03-27 7:59 ` Boris Brezillon
2018-03-21 13:01 ` [PATCH v2 06/16] mtd: rawnand: fsl_elbc: fix " Miquel Raynal
2018-03-27 7:56 ` Boris Brezillon
2018-03-21 13:01 ` [PATCH v2 07/16] mtd: rawnand: fsl_ifc: " Miquel Raynal
2018-03-27 7:57 ` Boris Brezillon [this message]
2018-03-21 13:01 ` [PATCH v2 08/16] mtd: rawnand: fsmc: fix and enhance " Miquel Raynal
2018-03-27 8:05 ` Boris Brezillon
2018-03-21 13:01 ` [PATCH v2 09/16] mtd: rawnand: mxc: fix " Miquel Raynal
2018-03-21 13:01 ` [PATCH v2 10/16] mtd: rawnand: omap2: fix the " Miquel Raynal
2018-03-21 13:01 ` [PATCH v2 11/16] mtd: rawnand: sh_flctl: " Miquel Raynal
2018-03-21 13:01 ` [PATCH v2 12/16] mtd: rawnand: tango: fix " Miquel Raynal
2018-03-21 13:01 ` [PATCH v2 13/16] mtd: rawnand: hisi504: fix and enhance the " Miquel Raynal
2018-03-27 8:56 ` Boris Brezillon
2018-03-21 13:01 ` [PATCH v2 14/16] mtd: rawnand: lpc32xx_mlc: " Miquel Raynal
2018-03-21 13:01 ` [PATCH v2 15/16] mtd: rawnand: lpc32xx_slc: " Miquel Raynal
2018-03-21 13:01 ` [PATCH v2 16/16] mtd: rawnand: s3c2410: " Miquel Raynal
2018-03-27 9:06 ` Boris Brezillon
2018-04-21 17:56 ` Miquel Raynal
2018-03-28 8:38 ` [PATCH v2 00/16] Fix probe functions " Boris Brezillon
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20180327095708.2ad361c9@bbrezillon \
--to=boris.brezillon@bootlin.com \
--cc=computersforpeace@gmail.com \
--cc=dwmw2@infradead.org \
--cc=kdasu.kdev@gmail.com \
--cc=linux-mtd@lists.infradead.org \
--cc=marek.vasut@gmail.com \
--cc=miquel.raynal@bootlin.com \
--cc=richard@nod.at \
--cc=yamada.masahiro@socionext.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
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).