Commit ebf2e930 authored by Roel Kluin's avatar Roel Kluin Committed by David Woodhouse

mtd: mtdconcat: prevent a read from eraseregions[-1]

If the erase region was found in the first iteration we read from
eraseregions[-1]
Signed-off-by: default avatarRoel Kluin <roel.kluin@gmail.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarDavid Woodhouse <David.Woodhouse@intel.com>
parent 4c1e6b2c
...@@ -427,7 +427,7 @@ static int concat_erase(struct mtd_info *mtd, struct erase_info *instr) ...@@ -427,7 +427,7 @@ static int concat_erase(struct mtd_info *mtd, struct erase_info *instr)
* to-be-erased area begins. Verify that the starting * to-be-erased area begins. Verify that the starting
* offset is aligned to this region's erase size: * offset is aligned to this region's erase size:
*/ */
if (instr->addr & (erase_regions[i].erasesize - 1)) if (i < 0 || instr->addr & (erase_regions[i].erasesize - 1))
return -EINVAL; return -EINVAL;
/* /*
...@@ -440,8 +440,8 @@ static int concat_erase(struct mtd_info *mtd, struct erase_info *instr) ...@@ -440,8 +440,8 @@ static int concat_erase(struct mtd_info *mtd, struct erase_info *instr)
/* /*
* check if the ending offset is aligned to this region's erase size * check if the ending offset is aligned to this region's erase size
*/ */
if ((instr->addr + instr->len) & (erase_regions[i].erasesize - if (i < 0 || ((instr->addr + instr->len) &
1)) (erase_regions[i].erasesize - 1)))
return -EINVAL; return -EINVAL;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment