---

yaml
---
r: 165463
b: refs/heads/master
c: 4c1e6b2
h: refs/heads/master
i:
  165461: 8003680
  165459: e78037c
  165455: a3b6d1b
v: v3

[refs]

@@ -1,2 +1,2 @@
 ---
-refs/heads/master: f12a9473283e68ae708e9ada37cb352ea2652397
+refs/heads/master: 4c1e6b2ce13b154a4a69cee220c98976f4b784df

trunk/drivers/mtd/devices/lart.c

@@ -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;