mirror of
https://github.com/torvalds/linux.git
synced 2026-11-20 13:03:48 +00:00
spi: axi-spi-engine: Start the program length at zero
spi_engine_optimize_message() allocates the program with kzalloc_flex(),
which sets the __counted_by() counter "length" to the allocated size when
the compiler supports __builtin_counted_by_ref(). The program is then
filled by spi_engine_program_add_cmd(), which increments "length" and
stores at length - 1, expecting it to start at zero as it did when the
program came from kzalloc().
Reset "length" after the allocation, since it is a "usage" counter, not
a "total allocation" counter.
Build tested ARCH=x86_64 defconfig with CONFIG_SPI_AXI_SPI_ENGINE=m and
W=1, with GCC 16.2.0.
Reported-by: Dennis Gilmore <[email protected]>
Closes: https://lore.kernel.org/all/[email protected]/
Fixes: 69050f8d6d ("treewide: Replace kmalloc with kmalloc_obj for non-scalar types")
Cc: [email protected]
Signed-off-by: Kees Cook <[email protected]>
Reviewed-by: David Lechner <[email protected]>
Link: https://patch.msgid.link/[email protected]
Signed-off-by: Mark Brown <[email protected]>
This commit is contained in:
@@ -818,6 +818,8 @@ static int spi_engine_optimize_message(struct spi_message *msg)
|
||||
p = kzalloc_flex(*p, instructions, p_dry.length + 1);
|
||||
if (!p)
|
||||
return -ENOMEM;
|
||||
/* spi_engine_program_add_cmd() counts the instructions as it adds them. */
|
||||
p->length = 0;
|
||||
|
||||
spi_engine_compile_message(msg, false, p);
|
||||
|
||||
|
||||
Reference in New Issue
Block a user