From: Kees Cook <kees@kernel.org>
To: Michael Hennerich <michael.hennerich@analog.com>
Cc: "Kees Cook" <kees@kernel.org>, "Nuno Sá" <nuno.sa@analog.com>,
"David Lechner" <dlechner@baylibre.com>,
"Mark Brown" <broonie@kernel.org>,
"Gustavo A. R. Silva" <gustavoars@kernel.org>,
linux-spi@vger.kernel.org, linux-hardening@vger.kernel.org,
"Dennis Gilmore" <dennis@ausil.us>,
stable@vger.kernel.org, linux-kernel@vger.kernel.org
Subject: [PATCH] spi: axi-spi-engine: Start the program length at zero
Date: Thu, 12 Nov 2026 22:55:12 -0800 [thread overview]
Message-ID: <20261113065508.i.606-kees@kernel.org> (raw)
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 <dennis@ausil.us>
Closes: https://lore.kernel.org/all/20261112025252.71375-1-dennis@ausil.us/
Fixes: 69050f8d6d075 ("treewide: Replace kmalloc with kmalloc_obj for non-scalar types")
Cc: stable@vger.kernel.org
Signed-off-by: Kees Cook <kees@kernel.org>
---
drivers/spi/spi-axi-spi-engine.c | 2 ++
1 file changed, 2 insertions(+)
diff --git a/drivers/spi/spi-axi-spi-engine.c b/drivers/spi/spi-axi-spi-engine.c
index ead5b295e680..9cfee409f15c 100644
--- a/drivers/spi/spi-axi-spi-engine.c
+++ b/drivers/spi/spi-axi-spi-engine.c
@@ -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);
--
2.55.0
reply other threads:[~2026-11-13 6:55 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20261113065508.i.606-kees@kernel.org \
--to=kees@kernel.org \
--cc=broonie@kernel.org \
--cc=dennis@ausil.us \
--cc=dlechner@baylibre.com \
--cc=gustavoars@kernel.org \
--cc=linux-hardening@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-spi@vger.kernel.org \
--cc=michael.hennerich@analog.com \
--cc=nuno.sa@analog.com \
--cc=stable@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®