e585841044
This backports some patches from linux upstream. Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de> SVN-Revision: 39249
30 lines
903 B
Diff
30 lines
903 B
Diff
From 99b1d1887fee36ef9ff5d2ee24f0cf3e8c172104 Mon Sep 17 00:00:00 2001
|
|
From: Hauke Mehrtens <hauke@hauke-m.de>
|
|
Date: Sun, 13 Oct 2013 22:53:49 +0200
|
|
Subject: [PATCH] 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>
|
|
---
|
|
drivers/mtd/bcm47xxpart.c | 7 +++++++
|
|
1 file changed, 7 insertions(+)
|
|
|
|
--- a/drivers/mtd/bcm47xxpart.c
|
|
+++ b/drivers/mtd/bcm47xxpart.c
|
|
@@ -71,7 +71,14 @@ static int bcm47xxpart_parse(struct mtd_
|
|
/* 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;
|