From: Sachin Kamat <sachin.kamat@linaro.org>
Date: Tue, 25 Sep 2012 09:57:13 +0000 (+0530)
Subject: mtd: ofpart: Fix incorrect NULL check in parse_ofoldpart_partitions()
X-Git-Tag: firefly_0821_release~3680^2~1388^2~91
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=ecbcbc7b75bb1b7596fca2d588d2f7539dc4e581;p=firefly-linux-kernel-4.4.55.git

mtd: ofpart: Fix incorrect NULL check in parse_ofoldpart_partitions()

The pointer returned by kzalloc should be tested for NULL
to avoid potential NULL pointer dereference later. Incorrect
pointer was being tested for NULL. Bug introduced by commit fbcf62a3
(mtd: physmap_of: move parse_obsolete_partitions to become separate
parser).
This patch fixes this bug.

Signed-off-by: Sachin Kamat <sachin.kamat@linaro.org>
Cc: stable@vger.kernel.org [3.2+]
Signed-off-by: Artem Bityutskiy <artem.bityutskiy@linux.intel.com>
---

diff --git a/drivers/mtd/ofpart.c b/drivers/mtd/ofpart.c
index 64be8f0848b0..d9127e2ed808 100644
--- a/drivers/mtd/ofpart.c
+++ b/drivers/mtd/ofpart.c
@@ -121,7 +121,7 @@ static int parse_ofoldpart_partitions(struct mtd_info *master,
 	nr_parts = plen / sizeof(part[0]);
 
 	*pparts = kzalloc(nr_parts * sizeof(*(*pparts)), GFP_KERNEL);
-	if (!pparts)
+	if (!*pparts)
 		return -ENOMEM;
 
 	names = of_get_property(dp, "partition-names", &plen);