From: "Ard Biesheuvel" <ardb@kernel.org>
To: "Mohamad Raizudeen" <raizudeen.kerneldev@gmail.com>,
"Eric Biggers" <ebiggers@kernel.org>
Cc: "Jason A . Donenfeld" <Jason@zx2c4.com>,
"Shuah Khan" <skhan@linuxfoundation.org>,
me@brighamcampbell.com, jkoolstra@xs4all.nl,
linux-crypto@vger.kernel.org, linux-kernel@vger.kernel.org,
stable@vger.kernel.org
Subject: Re: [PATCH] crypto: chacha20poly1305 - Fix missing state zeroization in xchacha decrypt
Date: Sat, 03 Oct 2026 09:34:21 +0200 [thread overview]
Message-ID: <b937fca8-f436-47a5-988c-963fa1af6296@app.fastmail.com> (raw)
In-Reply-To: <20261003060826.7792-1-raizudeen.kerneldev@gmail.com>
On Sat, 3 Oct 2026, at 08:08, Mohamad Raizudeen wrote:
> The `__chacha20poly1305_decrypt` function does not zeroize the chacha
> state, unlike its encrypt counterpart. The regular
> `chacha20poly1305_decrypt` function handles this by manually calling
> chacha_zeroize_state(). However, `xchacha20poly1305_decrypt` returns
> the result directly without clearing the state.
>
> This leaves the derived chacha20 subkey on the stack after the function
> returns. Fix this by storing the return value, calling
> chacha_zeroize_state() and then returning the result, matching the
> logic in `chacha20poly1305_decrypt`.
>
> Fixes: ed20078b7e333 ("crypto: chacha20poly1305 - import construction
> and selftest from Zinc")
> Cc: stable@vger.kernel.org
> Signed-off-by: Mohamad Raizudeen <raizudeen.kerneldev@gmail.com>
> ---
> lib/crypto/chacha20poly1305.c | 5 ++++-
> 1 file changed, 4 insertions(+), 1 deletion(-)
>
> diff --git a/lib/crypto/chacha20poly1305.c
> b/lib/crypto/chacha20poly1305.c
> index ea42a28f4ff7..03b14d272520 100644
> --- a/lib/crypto/chacha20poly1305.c
> +++ b/lib/crypto/chacha20poly1305.c
> @@ -199,10 +199,13 @@ bool xchacha20poly1305_decrypt(u8 *dst, const u8
> *src, const size_t src_len,
> const u8 key[at_least CHACHA20POLY1305_KEY_SIZE])
> {
> struct chacha_state chacha_state;
> + bool ret;
>
> xchacha_init(&chacha_state, key, nonce);
> - return __chacha20poly1305_decrypt(dst, src, src_len, ad, ad_len,
> + ret = __chacha20poly1305_decrypt(dst, src, src_len, ad, ad_len,
> &chacha_state);
> + chacha_zeroize_state(&chacha_state);
> + return ret;
> }
> EXPORT_SYMBOL(xchacha20poly1305_decrypt);
>
Wouldn't it be better to move the existing call from chacha20poly1305_decrypt()
to __chacha20poly1305_decrypt()?
next prev parent reply other threads:[~2026-10-03 7:34 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2026-10-03 6:08 Mohamad Raizudeen
2026-10-03 7:34 ` Ard Biesheuvel [this message]
2026-10-03 8:57 ` Eric Biggers
2026-10-03 9:28 ` Ard Biesheuvel
2026-10-03 16:39 ` Eric Biggers
2026-10-03 16:55 ` Mohamad Raizudeen
2026-10-03 20:22 ` Jason A. Donenfeld
2026-10-04 3:20 ` Mohamad Raizudeen
2026-10-04 16:52 ` Eric Biggers
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=b937fca8-f436-47a5-988c-963fa1af6296@app.fastmail.com \
--to=ardb@kernel.org \
--cc=Jason@zx2c4.com \
--cc=ebiggers@kernel.org \
--cc=jkoolstra@xs4all.nl \
--cc=linux-crypto@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=me@brighamcampbell.com \
--cc=raizudeen.kerneldev@gmail.com \
--cc=skhan@linuxfoundation.org \
--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®