diff options
| author | Rod Whitby <rod@whitby.id.au> | 2007-02-10 09:26:48 +0000 |
|---|---|---|
| committer | David Woodhouse <dwmw2@infradead.org> | 2007-02-10 09:26:48 +0000 |
| commit | 11192146e57bc8e58865e7d9c2497f66a4f7e6e7 (patch) | |
| tree | a4ca503fce35895f4031b11b92be45f1d35c2f15 | |
| parent | a2593247d747954cd12c32da8c5a3aecb9cd19a3 (diff) | |
| download | linux-stable-11192146e57bc8e58865e7d9c2497f66a4f7e6e7.tar.gz linux-stable-11192146e57bc8e58865e7d9c2497f66a4f7e6e7.tar.bz2 linux-stable-11192146e57bc8e58865e7d9c2497f66a4f7e6e7.zip | |
[MTD] Fix RedBoot partition parsing regression harder.
Correct the location of the recalculation of the FIS directory size,
and also add the same recalculation for the byte-swapped case.
Signed-off-by: Rod Whitby <rod@whitby.id.au>
Signed-off-by: David Woodhouse <dwmw2@infradead.org>
| -rw-r--r-- | drivers/mtd/redboot.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/drivers/mtd/redboot.c b/drivers/mtd/redboot.c index 5a31f490368e..a459ffa1e676 100644 --- a/drivers/mtd/redboot.c +++ b/drivers/mtd/redboot.c @@ -96,6 +96,8 @@ static int parse_redboot_partitions(struct mtd_info *master, */ if (swab32(buf[i].size) == master->erasesize) { int j; + /* Update numslots based on actual FIS directory size */ + numslots = swab32(buf[i].size) / sizeof (struct fis_image_desc); for (j = 0; j < numslots; ++j) { /* A single 0xff denotes a deleted entry. @@ -120,11 +122,11 @@ static int parse_redboot_partitions(struct mtd_info *master, swab32s(&buf[j].desc_cksum); swab32s(&buf[j].file_cksum); } + } else { + /* Update numslots based on actual FIS directory size */ + numslots = buf[i].size / sizeof(struct fis_image_desc); } break; - } else if (buf[i].size != -1) { - /* re-calculate of real numslots */ - numslots = buf[i].size / sizeof(struct fis_image_desc); } } if (i == numslots) { |