Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 4c1e6b2c authored by Roel Kluin's avatar Roel Kluin Committed by David Woodhouse
Browse files

mtd: lart: Prevent a read from mtd->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 f12a9473

drivers/mtd/devices/lart.c

+4 −2
Original line number Diff line number Diff line
@@ -393,7 +393,8 @@ static int flash_erase (struct mtd_info *mtd,struct erase_info *instr) 
	* 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 *mtd,struct erase_info *instr) 
   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;