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

Commit b1633635 authored by Alexander Sverdlin's avatar Alexander Sverdlin Committed by Greg Kroah-Hartman
Browse files

mtd: spi-nor: Check for zero erase size in spi_nor_find_best_erase_type() 



commit 2ebc336be08160debfe27f87660cf550d710f3e9 upstream.

Erase can be zeroed in spi_nor_parse_4bait() or
spi_nor_init_non_uniform_erase_map(). In practice it happened with
mt25qu256a, which supports 4K, 32K, 64K erases with 3b address commands,
but only 4K and 64K erase with 4b address commands.

Fixes: dc928431 ("mtd: spi-nor: fix erase_type array to indicate current map conf")
Signed-off-by: default avatarAlexander Sverdlin <alexander.sverdlin@nokia.com>
Signed-off-by: default avatarTudor Ambarus <tudor.ambarus@microchip.com>
Cc: stable@vger.kernel.org
Link: https://lore.kernel.org/r/20211119081412.29732-1-alexander.sverdlin@nokia.com


Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 74531c23

drivers/mtd/spi-nor/spi-nor.c

+2 −0
Original line number Diff line number Diff line
@@ -1010,6 +1010,8 @@ spi_nor_find_best_erase_type(const struct spi_nor_erase_map *map, 
			continue;



		erase = &map->erase_type[i];

		if (!erase->size)

			continue;



		/* Alignment is not mandatory for overlaid regions */

		if (region->offset & SNOR_OVERLAID_REGION &&