Merge git://git.infradead.org/mtd-2.6

* git://git.infradead.org/mtd-2.6: (84 commits)
  [JFFS2] debug.h: include <linux/sched.h> for current->pid
  [MTD] OneNAND: Handle DDP chip boundary during read-while-load
  [MTD] OneNAND: return ecc error code only when 2-bit ecc occurs
  [MTD] OneNAND: Implement read-while-load
  [MTD] OneNAND: fix onenand_wait bug in read ecc error
  [MTD] OneNAND: release CPU in cycles
  [MTD] OneNAND: add subpage write support
  [MTD] OneNAND: fix onenand_wait bug
  [JFFS2] use the ref_offset macro
  [JFFS2] Reschedule in loops
  [JFFS2] Fix error-path leak in summary scan
  [JFFS2] add cond_resched() when garbage collecting deletion dirent
  [MTD] Nuke IVR leftovers
  [MTD] OneNAND: fix oob handling in recent oob patch
  [MTD] Fix ssfdc blksize typo
  [JFFS2] replace kmalloc+memset with kzalloc
  [MTD] Fix SSFDC build for variable blocksize.
  [MTD] ESB2ROM uses PCI
  [MTD] of_device-based physmap driver
  [MTD] Support combined RedBoot FIS directory and configuration area
  ...

1 files changed, 24 insertions, 6 deletions

diff --git a/drivers/mtd/redboot.c b/drivers/mtd/redboot.c
index 5b58523e4d4e..035cd9b0cc08 100644
--- a/drivers/mtd/redboot.c
+++ b/drivers/mtd/redboot.c
@@ -96,7 +96,19 @@ static int parse_redboot_partitions(struct mtd_info *master,
                          */
                         if (swab32(buf[i].size) == master->erasesize) {
                                 int j;
-                                for (j = 0; j < numslots && buf[j].name[0] != 0xff; ++j) {
+                                for (j = 0; j < numslots; ++j) {
+
+                                        /* A single 0xff denotes a deleted entry.
+                                         * Two of them in a row is the end of the table.
+                                         */
+                                        if (buf[j].name[0] == 0xff) {
+                                                if (buf[j].name[1] == 0xff) {
+                                                        break;
+                                                } else {
+                                                        continue;
+                                                }
+                                        }
+
                                         /* The unsigned long fields were written with the
                                          * wrong byte sex, name and pad have no byte sex.
                                          */
@@ -110,6 +122,9 @@ static int parse_redboot_partitions(struct mtd_info *master,
                                 }
                         }
                         break;
+                } else {
+                        /* re-calculate of real numslots */
+                        numslots = buf[i].size / sizeof(struct fis_image_desc);
                 }
         }
         if (i == numslots) {
@@ -123,8 +138,13 @@ static int parse_redboot_partitions(struct mtd_info *master,
         for (i = 0; i < numslots; i++) {
                 struct fis_list *new_fl, **prev;
 
-                if (buf[i].name[0] == 0xff)
-                        continue;
+                if (buf[i].name[0] == 0xff) {
+                        if (buf[i].name[1] == 0xff) {
+                                break;
+                        } else {
+                                continue;
+                        }
+                }
                 if (!redboot_checksum(&buf[i]))
                         break;
 
@@ -165,15 +185,13 @@ static int parse_redboot_partitions(struct mtd_info *master,
                 }
         }
 #endif
-        parts = kmalloc(sizeof(*parts)*nrparts + nulllen + namelen, GFP_KERNEL);
+        parts = kzalloc(sizeof(*parts)*nrparts + nulllen + namelen, GFP_KERNEL);
 
         if (!parts) {
                 ret = -ENOMEM;
                 goto out;
         }
 
-        memset(parts, 0, sizeof(*parts)*nrparts + nulllen + namelen);
-
         nullname = (char *)&parts[nrparts];
 #ifdef CONFIG_MTD_REDBOOT_PARTS_UNALLOCATED
         if (nulllen > 0) {