aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/mtd/mtdcore.c
diff options
context:
space:
mode:
authorJason Liu <jason.hui@linaro.org>2011-08-24 07:26:28 -0400
committerArtem Bityutskiy <artem.bityutskiy@intel.com>2011-09-11 08:02:18 -0400
commit4d523b60ef9d1953d9e12745ca0ed3e2dc98c189 (patch)
tree9fb26d87e6658d03861de2134edea5b2dbb9ecdc /drivers/mtd/mtdcore.c
parente2e24e8ebf0e96571fbbac95c215df6a2cebbc5b (diff)
mtd: check parts pointer before using it
The code has the check for parts but it called after kmemdup, kmemdup(parts, sizeof(*parts) * nr_parts,...) if (!parts) return -ENOMEM In fact, we need check parts before safely using it. and we also need check the real_parts to make sure kmemdup allocation sucessfully. Signed-off-by: Jason Liu <jason.hui@linaro.org> Signed-off-by: Artem Bityutskiy <artem.bityutskiy@intel.com>
Diffstat (limited to 'drivers/mtd/mtdcore.c')
-rw-r--r--drivers/mtd/mtdcore.c7
1 files changed, 4 insertions, 3 deletions
diff --git a/drivers/mtd/mtdcore.c b/drivers/mtd/mtdcore.c
index 09bdbac51868..b01993ea260e 100644
--- a/drivers/mtd/mtdcore.c
+++ b/drivers/mtd/mtdcore.c
@@ -465,12 +465,13 @@ int mtd_device_parse_register(struct mtd_info *mtd, const char **types,
465 struct mtd_partition *real_parts; 465 struct mtd_partition *real_parts;
466 466
467 err = parse_mtd_partitions(mtd, types, &real_parts, parser_data); 467 err = parse_mtd_partitions(mtd, types, &real_parts, parser_data);
468 if (err <= 0 && nr_parts) { 468 if (err <= 0 && nr_parts && parts) {
469 real_parts = kmemdup(parts, sizeof(*parts) * nr_parts, 469 real_parts = kmemdup(parts, sizeof(*parts) * nr_parts,
470 GFP_KERNEL); 470 GFP_KERNEL);
471 err = nr_parts; 471 if (!real_parts)
472 if (!parts)
473 err = -ENOMEM; 472 err = -ENOMEM;
473 else
474 err = nr_parts;
474 } 475 }
475 476
476 if (err > 0) { 477 if (err > 0) {