summaryrefslogtreecommitdiffstats
path: root/drivers/mtd/bcm47xxpart.c
diff options
context:
space:
mode:
authorHauke Mehrtens <hauke@hauke-m.de>2013-10-13 22:53:49 +0200
committerBrian Norris <computersforpeace@gmail.com>2013-11-07 08:32:57 +0100
commit99b1d1887fee36ef9ff5d2ee24f0cf3e8c172104 (patch)
tree57b873a3b0087676ceb10d23a7b15327f146efc8 /drivers/mtd/bcm47xxpart.c
parentmtd: bcm47xxnflash: Use devm_kzalloc (diff)
downloadlinux-99b1d1887fee36ef9ff5d2ee24f0cf3e8c172104.tar.xz
linux-99b1d1887fee36ef9ff5d2ee24f0cf3e8c172104.zip
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>
Diffstat (limited to 'drivers/mtd/bcm47xxpart.c')
-rw-r--r--drivers/mtd/bcm47xxpart.c7
1 files changed, 7 insertions, 0 deletions
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;