diff options
author | hauke <hauke@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2014-01-12 18:50:45 +0000 |
---|---|---|
committer | hauke <hauke@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2014-01-12 18:50:45 +0000 |
commit | 188021a18c27dc529e94a2d6ee39a7e5f222db60 (patch) | |
tree | e9b37577fc52e745c79274ae458da97281b9c854 /target/linux/brcm47xx/patches-3.10/020-mtd-bcm47xxpart-handle-malloc-failures.patch | |
parent | dc99be38c7654498bc98347f080bb43b7b209c41 (diff) |
brcm47xx: update mtd drivers
This backports some patches from linux upstream.
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@39249 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/brcm47xx/patches-3.10/020-mtd-bcm47xxpart-handle-malloc-failures.patch')
-rw-r--r-- | target/linux/brcm47xx/patches-3.10/020-mtd-bcm47xxpart-handle-malloc-failures.patch | 30 |
1 files changed, 30 insertions, 0 deletions
diff --git a/target/linux/brcm47xx/patches-3.10/020-mtd-bcm47xxpart-handle-malloc-failures.patch b/target/linux/brcm47xx/patches-3.10/020-mtd-bcm47xxpart-handle-malloc-failures.patch new file mode 100644 index 0000000000..ad24b5993d --- /dev/null +++ b/target/linux/brcm47xx/patches-3.10/020-mtd-bcm47xxpart-handle-malloc-failures.patch @@ -0,0 +1,30 @@ +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; |