diff options
| author | Alexander Sverdlin <alexander.sverdlin@nokia.com> | 2021-11-19 09:14:12 +0100 |
|---|---|---|
| committer | Tudor Ambarus <tudor.ambarus@microchip.com> | 2022-11-21 09:56:08 +0200 |
| commit | 2ebc336be08160debfe27f87660cf550d710f3e9 (patch) | |
| tree | c1d5ebf80133de73fcd33bb5749a0faee03afd73 /drivers/mtd/spi-nor | |
| parent | bb0e9c600ce23a308b31e73d10b56e70a5721088 (diff) | |
| download | linux-stable-2ebc336be08160debfe27f87660cf550d710f3e9.tar.gz linux-stable-2ebc336be08160debfe27f87660cf550d710f3e9.tar.bz2 linux-stable-2ebc336be08160debfe27f87660cf550d710f3e9.zip | |
mtd: spi-nor: Check for zero erase size in spi_nor_find_best_erase_type()
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: dc92843159a7 ("mtd: spi-nor: fix erase_type array to indicate current map conf")
Signed-off-by: Alexander Sverdlin <alexander.sverdlin@nokia.com>
Signed-off-by: Tudor Ambarus <tudor.ambarus@microchip.com>
Cc: stable@vger.kernel.org
Link: https://lore.kernel.org/r/20211119081412.29732-1-alexander.sverdlin@nokia.com
Diffstat (limited to 'drivers/mtd/spi-nor')
| -rw-r--r-- | drivers/mtd/spi-nor/core.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/mtd/spi-nor/core.c b/drivers/mtd/spi-nor/core.c index aa05443c44c2..0079758b36aa 100644 --- a/drivers/mtd/spi-nor/core.c +++ b/drivers/mtd/spi-nor/core.c @@ -1184,6 +1184,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 && |