Commit 90c31cb9 authored Oct 19, 2018 by Boris Brezillon

mtd: spi-nor: Reset nor->addr_width when SFDP parsing failed



Commit 5390a8df ("mtd: spi-nor: add support to non-uniform SFDP SPI
NOR flash memories") removed the 'nor->addr_width = 0;' statement when
spi_nor_parse_sfdp() returns an error, thus leaving ->addr_width in an
undefined state which can cause trouble when spi_nor_scan() checks its
value.

Reported-by: Cyrille Pitchen <cyrille.pitchen@wedev4u.fr>
Fixes: 5390a8df ("mtd: spi-nor: add support to non-uniform SFDP SPI NOR flash memories")
Signed-off-by: Boris Brezillon <boris.brezillon@bootlin.com>
Reviewed-by: Tudor Ambarus <tudor.ambarus@microchip.com>

parent 91d7b670

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

+4 −2

Original line number	Diff line number	Diff line
		@@ -3250,13 +3250,15 @@ static int spi_nor_init_params(struct spi_nor *nor,
		memcpy(&sfdp_params, params, sizeof(sfdp_params));
		memcpy(&prev_map, &nor->erase_map, sizeof(prev_map));

		if (spi_nor_parse_sfdp(nor, &sfdp_params))
		if (spi_nor_parse_sfdp(nor, &sfdp_params)) {
		nor->addr_width = 0;
		/* restore previous erase map */
		memcpy(&nor->erase_map, &prev_map,
		sizeof(nor->erase_map));
		else
		} else {
		memcpy(params, &sfdp_params, sizeof(*params));
		}
		}

		return 0;
		}