From: Hauke Mehrtens <hauke@hauke-m.de>
Date: Sun, 13 Oct 2013 20:53:49 +0000 (+0200)
Subject: mtd: bcm47xxpart: handle malloc failures
X-Git-Url: http://drtracing.org/?a=commitdiff_plain;h=99b1d1887fee36ef9ff5d2ee24f0cf3e8c172104;p=deliverable%2Flinux.git

mtd: bcm47xxpart: handle malloc failures

Handle return NULL in malloc.

Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
Signed-off-by: Brian Norris <computersforpeace@gmail.com>
---

diff --git a/drivers/mtd/bcm47xxpart.c b/drivers/mtd/bcm47xxpart.c
index 9279a9174f84..6d427468c4cd 100644
--- a/drivers/mtd/bcm47xxpart.c
+++ b/drivers/mtd/bcm47xxpart.c
@@ -71,7 +71,14 @@ static int bcm47xxpart_parse(struct mtd_info *master,
 	/* Alloc */
 	parts = kzalloc(sizeof(struct mtd_partition) * BCM47XXPART_MAX_PARTS,
 			GFP_KERNEL);
+	if (!parts)
+		return -ENOMEM;
+
 	buf = kzalloc(BCM47XXPART_BYTES_TO_READ, GFP_KERNEL);
+	if (!buf) {
+		kfree(parts);
+		return -ENOMEM;
+	}
 
 	/* Parse block by block looking for magics */
 	for (offset = 0; offset <= master->size - blocksize;