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

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

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

drivers/mtd/mtdconcat.c

+3 −3
Original line number Diff line number Diff line
@@ -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

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



		/*
@@ -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

		 */

		if ((instr->addr + instr->len) & (erase_regions[i].erasesize -

						  1))

		if (i < 0 || ((instr->addr + instr->len) &

					(erase_regions[i].erasesize - 1)))

			return -EINVAL;

	}