2 files changed, 9 insertions, 3 deletions

diff --git a/drivers/mtd/ar7part.c b/drivers/mtd/ar7part.c
index ecf170b55c32..6697a1ec72d0 100644
--- a/drivers/mtd/ar7part.c
+++ b/drivers/mtd/ar7part.c
@@ -44,8 +44,6 @@ struct ar7_bin_rec {
         unsigned int address;
 };
 
-static struct mtd_partition ar7_parts[AR7_PARTS];
-
 static int create_mtd_partitions(struct mtd_info *master,
                                  struct mtd_partition **pparts,
                                  unsigned long origin)
@@ -57,7 +55,11 @@ static int create_mtd_partitions(struct mtd_info *master,
         unsigned int root_offset = ROOT_OFFSET;
 
         int retries = 10;
+        struct mtd_partition *ar7_parts;
 
+        ar7_parts = kzalloc(sizeof(*ar7_parts) * AR7_PARTS, GFP_KERNEL);
+        if (!ar7_parts)
+                return -ENOMEM;
         ar7_parts[0].name = "loader";
         ar7_parts[0].offset = 0;
         ar7_parts[0].size = master->erasesize;
diff --git a/drivers/mtd/cmdlinepart.c b/drivers/mtd/cmdlinepart.c
index 50a340388e74..5011fa73f918 100644
--- a/drivers/mtd/cmdlinepart.c
+++ b/drivers/mtd/cmdlinepart.c
@@ -335,7 +335,11 @@ static int parse_cmdline_partitions(struct mtd_info *master,
                                 }
                                 offset += part->parts[i].size;
                         }
-                        *pparts = part->parts;
+                        *pparts = kmemdup(part->parts,
+                                        sizeof(*part->parts) * part->num_parts,
+                                        GFP_KERNEL);
+                        if (!*pparts)
+                                return -ENOMEM;
                         return part->num_parts;
                 }
         }