mail archive of the barebox mailing list
 help / color / mirror / Atom feed
From: Sascha Hauer <s.hauer@pengutronix.de>
To: Barebox List <barebox@lists.infradead.org>
Subject: [PATCH 04/17] mtd: partitions: Add error check
Date: Thu, 12 Feb 2015 09:54:21 +0100	[thread overview]
Message-ID: <1423731274-9860-5-git-send-email-s.hauer@pengutronix.de> (raw)
In-Reply-To: <1423731274-9860-1-git-send-email-s.hauer@pengutronix.de>

add_mtd_device can fail. Add an error check and bail out properly.

Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
---
 drivers/mtd/partition.c | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/drivers/mtd/partition.c b/drivers/mtd/partition.c
index 033a7d2..c514d4b 100644
--- a/drivers/mtd/partition.c
+++ b/drivers/mtd/partition.c
@@ -108,6 +108,7 @@ struct mtd_info *mtd_add_partition(struct mtd_info *mtd, off_t offset,
 		uint64_t size, unsigned long flags, const char *name)
 {
 	struct mtd_info *part;
+	int ret;
 
 	part = xzalloc(sizeof(*part));
 
@@ -168,9 +169,17 @@ struct mtd_info *mtd_add_partition(struct mtd_info *mtd, off_t offset,
 	if (!strncmp(mtd->cdev.name, name, strlen(mtd->cdev.name)))
 		part->cdev.partname = xstrdup(name + strlen(mtd->cdev.name) + 1);
 
-	add_mtd_device(part, part->name, DEVICE_ID_SINGLE);
+	ret = add_mtd_device(part, part->name, DEVICE_ID_SINGLE);
+	if (ret)
+		goto err;
 
 	return part;
+err:
+	free(part->cdev.partname);
+	free(part->name);
+	free(part);
+
+	return ERR_PTR(ret);
 }
 
 int mtd_del_partition(struct mtd_info *part)
-- 
2.1.4


_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox

  parent reply	other threads:[~2015-02-12  8:55 UTC|newest]

Thread overview: 19+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2015-02-12  8:54 mtd partition handling updates Sascha Hauer
2015-02-12  8:54 ` [PATCH 01/17] of: Add for_each_child_of_node_safe Sascha Hauer
2015-02-12  8:54 ` [PATCH 02/17] mtd: core: add error checks Sascha Hauer
2015-02-12  8:54 ` [PATCH 03/17] mtd: partitions: Use xstrdup Sascha Hauer
2015-02-12  8:54 ` Sascha Hauer [this message]
2015-02-12  8:54 ` [PATCH 05/17] mtd: Add partitions to list Sascha Hauer
2015-02-12  8:54 ` [PATCH 06/17] mtd: nand: remove automatically created bb devices Sascha Hauer
2015-02-12  8:54 ` [PATCH 07/17] move cmdline partition parsing code to separate file Sascha Hauer
2015-02-12  8:54 ` [PATCH 08/17] cmdlinepart: Change SIZE_REMAINING to loff_t Sascha Hauer
2015-02-12  8:54 ` [PATCH 09/17] cmdlinepart: make argument types safer Sascha Hauer
2015-02-12  8:54 ` [PATCH 10/17] cmdlinepart: add function to parse a cmdline partition string Sascha Hauer
2015-02-12  8:54 ` [PATCH 11/17] cmndlinepart: skip devname if partstr already contains it Sascha Hauer
2015-02-12  8:54 ` [PATCH 12/17] mtd: forbid conflicting mtd partitions Sascha Hauer
2015-02-12  8:54 ` [PATCH 13/17] mtd: Use flags parameter in mtd_add_partition Sascha Hauer
2015-02-12  8:54 ` [PATCH 14/17] mtd: Add a partitions parameter to mtd devices Sascha Hauer
2015-02-12  8:54 ` [PATCH 15/17] mtd: fixup device tree partitions Sascha Hauer
2015-02-12  8:54 ` [PATCH 16/17] defaultenv-2: mtdparts-add: remove unused variable Sascha Hauer
2015-02-12  8:54 ` [PATCH 17/17] defaultenv-2: mtdparts-add: Use new partition parameter Sascha Hauer
2015-02-13  5:54 ` mtd partition handling updates Bo Shen

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=1423731274-9860-5-git-send-email-s.hauer@pengutronix.de \
    --to=s.hauer@pengutronix.de \
    --cc=barebox@lists.infradead.org \
    /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