mtd/jffs2: fix read buffer overflow
PATCH 9/13 mtd/jffs2: fix read buffer overflow
From: Roel Kluin <[email protected]>
Prevent a read from mtd->eraseregions[-1]
Signed-off-by Roel Kluin <[email protected]>
Cc David Woodhouse <[email protected]>
Signed-off-by Andrew Morton <[email protected]>
---
drivers/mtd/devices/lart.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-)
drivers/mtd/devices/lart.c renamed from drivers/mtd/devices/lart.c~mtd-jffs2-fix-read-buffer-overflow +4 -2
@@ -393,7 +393,8 @@ static int flash_erase (struct mtd_info* erase range is aligned with the erase size which is in * effect here. */ -if (instr->addr & (mtd->eraseregions[i].erasesize -1 ))return (-EINVAL ); +if (i <0 || (instr->addr & (mtd->eraseregions[i].erasesize -1 ))) +return -EINVAL ;/* Remember the erase region we start on */ first = i;
@@ -409,7 +410,8 @@ static int flash_erase (struct mtd_info i--;/* is the end aligned on a block boundary? */ -if ((instr->addr + instr->len) & (mtd->eraseregions[i].erasesize -1 ))return (-EINVAL ); +if (i <0 || ((instr->addr + instr->len) & (mtd->eraseregions[i].erasesize -1 ))) +return -EINVAL ; addr = instr->addr; len = instr->len;
_