Skip to content
Unverified Commit f0f0cfdc authored by Louis Rannou's avatar Louis Rannou Committed by Tudor Ambarus
Browse files

mtd: spi-nor: Fix shift-out-of-bounds in spi_nor_set_erase_type



spi_nor_set_erase_type() was used either to set or to mask out an erase
type. When we used it to mask out an erase type a shift-out-of-bounds
was hit:
UBSAN: shift-out-of-bounds in drivers/mtd/spi-nor/core.c:2237:24
shift exponent 4294967295 is too large for 32-bit type 'int'

The setting of the size_{shift, mask} and of the opcode are unnecessary
when the erase size is zero, as throughout the code just the erase size
is considered to determine whether an erase type is supported or not.
Setting the opcode to 0xFF was wrong too as nobody guarantees that 0xFF
is an unused opcode. Thus when masking out an erase type, just set the
erase size to zero. This will fix the shift-out-of-bounds.

Fixes: 5390a8df ("mtd: spi-nor: add support to non-uniform SFDP SPI NOR flash memories")
Cc: stable@vger.kernel.org
Reported-by: default avatarAlexander Stein <Alexander.Stein@tq-group.com>
Signed-off-by: default avatarLouis Rannou <lrannou@baylibre.com>
Tested-by: default avatarAlexander Stein <Alexander.Stein@tq-group.com>
Link: https://lore.kernel.org/r/20230203070754.50677-1-tudor.ambarus@linaro.org


[ta: refine changes, new commit message, fix compilation error]
Signed-off-by: default avatarTudor Ambarus <tudor.ambarus@linaro.org>
parent 59273180
Loading
Loading
Loading
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment