Skip to content

Commit ca18c18

Browse files
ambarusgregkh
authored andcommitted
mtd: spi-nor: debugfs: fix out-of-bounds read in spi_nor_params_show()
commit e47029b upstream. Sashiko noticed an out-of-bounds read [1]. In spi_nor_params_show(), the snor_f_names array is passed to spi_nor_print_flags() using sizeof(snor_f_names). Since snor_f_names is an array of pointers, sizeof() returns the total number of bytes occupied by the pointers (element_count * sizeof(void *)) rather than the element count itself. On 64-bit systems, this makes the passed length 8x larger than intended. Inside spi_nor_print_flags(), the 'names_len' argument is used to bounds-check the 'names' array access. An out-of-bounds read occurs if a flag bit is set that exceeds the array's actual element count but is within the inflated byte-size count. Correct this by using ARRAY_SIZE() to pass the actual number of string pointers in the array. Cc: stable@vger.kernel.org Fixes: 0257be7 ("mtd: spi-nor: expose internal parameters via debugfs") Closes: https://sashiko.dev/#/patchset/20260417-die-erase-fix-v2-1-73bb7004ebad%40infineon.com [1] Signed-off-by: Tudor Ambarus <tudor.ambarus@linaro.org> Reviewed-by: Takahiro Kuwano <takahiro.kuwano@infineon.com> Reviewed-by: Michael Walle <mwalle@kernel.org> Reviewed-by: Pratyush Yadav <pratyush@kernel.org> Signed-off-by: Miquel Raynal <miquel.raynal@bootlin.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
1 parent 9812d79 commit ca18c18

1 file changed

Lines changed: 3 additions & 1 deletion

File tree

drivers/mtd/spi-nor/debugfs.c

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
// SPDX-License-Identifier: GPL-2.0
22

3+
#include <linux/array_size.h>
34
#include <linux/debugfs.h>
45
#include <linux/mtd/spi-nor.h>
56
#include <linux/spi/spi.h>
@@ -92,7 +93,8 @@ static int spi_nor_params_show(struct seq_file *s, void *data)
9293
seq_printf(s, "address nbytes\t%u\n", nor->addr_nbytes);
9394

9495
seq_puts(s, "flags\t\t");
95-
spi_nor_print_flags(s, nor->flags, snor_f_names, sizeof(snor_f_names));
96+
spi_nor_print_flags(s, nor->flags, snor_f_names,
97+
ARRAY_SIZE(snor_f_names));
9698
seq_puts(s, "\n");
9799

98100
seq_puts(s, "\nopcodes\n");

0 commit comments

Comments
 (0)