From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-dy2-f43.google.com (mail-dy2-f43.google.com [74.125.229.43]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 532F0479888 for ; Sat, 3 Oct 2026 16:55:10 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=74.125.229.43 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1791046512; cv=none; b=mTlvwFIzcfntiJ/i84QQNLZ0vep8AY5JDUpkBSQTWoHyEc8kcaqwEg0WDXxY0OmbaRItTzCayR1269HfQlUiW7reY/AJw0tbANc7wFmxNt+Zb/FoPdGW7nJyyYw2cEvyJVkAY3vG2hIyJIgItTkAtCAzP9tMV0fTmh4K0jpdRxI= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1791046512; c=relaxed/simple; bh=X+JsHy9hcmmtZJVBa9Kkkln84dK+oOE5eRwAZnxmFJY=; h=Date:From:To:Cc:Subject:Message-ID:References:MIME-Version: Content-Type:Content-Disposition:In-Reply-To; b=pSUwQ+zGa0kbpLD8o/6YWHsDo5/9cUWaMcXHkGBlQyJrXRZxiK1tXUxFnK+BDZzuyvR3/P57otNlvntrLu1jI0VuAqXZoWvHqXz32rkBjkIaABT+WoFclaRrQPWw6AvKFLI4eZtMj3qDsM6d0hQWjuq97HfQp3/oeOgLacgrHi8= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=Wpb5/xPa; arc=none smtp.client-ip=74.125.229.43 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="Wpb5/xPa" Received: by mail-dy2-f43.google.com with SMTP id 5a478bee46e88-34b1743e9c7so383727eec.3 for ; Sat, 03 Oct 2026 09:55:10 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1791046509; x=1791651309; darn=vger.kernel.org; h=in-reply-to:content-disposition:content-type:mime-version :references:message-id:subject:cc:to:from:date:from:to:cc:subject :date:message-id:reply-to:content-type; bh=vfNONSg/6lEhGon/gJ7DMZGMT+W70fNRaOzKZcnrLmk=; b=Wpb5/xPa8rjPsNtwJuOIGUdW1VZv1F1GswyijTEk3+u6K13k3G9zKd83uHTu8DNBQL HlLpFC/tBuNizcPJdF5FFZPkJjbGDILUzZzOrSGX2S+GQyzZHP8N7YTlGuQywOL0hWP0 moN1QMSJmvpQOIsmpzPkyiQswObFuuE0BxL6huVI22vQdNMwnAeSXAfzx92jWdiLEgD/ vYUX2O3kjDfwyHc/zeLFn4PHTQ6NndBFrtRe55STFDEhy/qPTJEJKcYRwp9SQYue8vPd Qz+FSHTPpobiUMTHs3dKKaYuaT32ljJOAn84e+tfqx0pqn3RSI9wZMjeJ+FbzjmGGVap pBVQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20260707; t=1791046509; x=1791651309; h=in-reply-to:content-disposition:content-type:mime-version :references:message-id:subject:cc:to:from:date:x-gm-gg :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to :content-type; bh=vfNONSg/6lEhGon/gJ7DMZGMT+W70fNRaOzKZcnrLmk=; b=uvGPayMY6wqf++Z5JWTBM64cNw/9LzcUQmodaXBMelhJeYgrgClXKtoYHQYFlAxr5x 0ng0ZJ69biJk2vRAWc8nRH7wrZxrgl3ektyljz6hJP6kNlQ5xujHw6074d1s67uGv5bd RwIkZjXe1ExrvRRX8zTnVTuLIYSmK9RdtdRZb7n7r80DbVCEfrRM1wGDoYHeOTCvtr56 Lqw33LoZ8JRYfGqQsGJkaCja/WgRFOeg139is7dENULUL7wdIRrMX7bdF5sU7RuMntCF chKKG1rwDeK4PznIlvrJe8/VT3L3nx2I28c1CI1T9ktD5qK8beSUAnV4/6Ng96eIqiI5 +pOQ== X-Forwarded-Encrypted: i=1; AKwUvByhfUibuLk+W9jYTeTeoXYQcsERg39BzRaRGpHLX0zBKJq1zWEZWELJysVZ4iv7qAMFUhlwh5dk7xIeHJ4=@vger.kernel.org X-Gm-Message-State: AFuF++kyK/JfFHjols+AdDpb62Y3Cu4+MKu1gpth43VN79Ify8a+Ftj9 gFtMcDXyHSAChBOSurB8e8u1ahdERpnTAfTUxldcoOWR6I+22Fk+GILuPh63BA== X-Gm-Gg: AYBFou2C5dwix9+tUwD3LHVHm56HB+dSJ2iuy2Jk1VqiVSSmeahP2jX3LGESY1VU/Lp bf3WPLeFhDa87+l5iM5Of/lWMj+TJNMPb/VUrU/V1EKdr4+7948pE7uOIIwhvDjy4ADqfH/Q39M FiOhVwl0R8ijXsSDE+blIIlDiMRaK7opwRP6k9lU7z2nBW/5tBjf6nt+DYvHatEcRCyrZdja+Y1 0rnzc9OC7WIyepiA7MQLyFls5GxgadvCa61sT99+L7MfakGIDOmaZAW/9rGMSeUM9eDh8EQ5EZV m81SW6mWSVsWzLfVImGkVj2i80t1HR3gGvLemvAgwIoCVZYnWcbMutG9Q5k0/b9OeYDO5Mnto6I hM9UHeNZuE/UUKfRJVtBllmk4IAezmSBbYqcUFrHzXRZ/7PbH1yq8O4Su0efy4VMgrcZVMFMqcg GbTVgw0dUxyQFN+XqySdbjQapTtTeCPfPafBnrrwU6c2P4g/tQ96WHkmJQ6+WHW9hGsrXtDstCk f9OQetCXjnOAqHq/PNWWAqXyYLb X-Received: by 2002:a05:7022:304:b0:14a:51c8:e9f2 with SMTP id a92af1059eb24-14f5c2ef7bfmr11363603c88.31.1791046509232; Sat, 03 Oct 2026 09:55:09 -0700 (PDT) Received: from kernel ([103.219.206.69]) by smtp.gmail.com with ESMTPSA id a92af1059eb24-151fa751693sm18671183c88.2.2026.10.03.09.55.05 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 03 Oct 2026 09:55:08 -0700 (PDT) Date: Sat, 3 Oct 2026 22:25:01 +0530 From: Mohamad Raizudeen To: Eric Biggers Cc: Ard Biesheuvel , "Jason A . Donenfeld" , Shuah Khan , 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 Message-ID: References: <20261003060826.7792-1-raizudeen.kerneldev@gmail.com> <20261003085757.GA144870@quark> <20261003163926.GC152469@quark> Precedence: bulk X-Mailing-List: linux-crypto@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20261003163926.GC152469@quark> On Sat, Oct 03, 2026 at 06:39:26PM +0200, Eric Biggers wrote: > On Sat, Oct 03, 2026 at 11:28:20AM +0200, Ard Biesheuvel wrote: > > > > > > On Sat, 3 Oct 2026, at 10:57, Eric Biggers wrote: > > > On Sat, Oct 03, 2026 at 09:34:21AM +0200, Ard Biesheuvel wrote: > > >> > > >> > > >> 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 > > >> > --- > > >> > 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()? > > > > > > Since __chacha20poly1305_decrypt() has two return statements that would > > > need to be considered, I think this patch (which makes each > > > *chacha_init() clearly paired with chacha_zeroize_state()) is slightly > > > cleaner. > > > > > > > Fair enough. > > Actually, looking at the whole file, in the encryption case > __chacha20poly1305_encrypt() already "takes ownership" of the state and > handles zeroizing it. So given that, I think it does make sense for > __chacha20poly1305_decrypt() to do the same thing, for consistency > between the encryption and decryption cases. > > Mohamad, could you send out a v2 that does that? > > Also, for the subject prefix, use: "lib/crypto: chacha20poly1305:" > > Thanks! > > - Eric Hi Eric, Sure, I will send the v2 soon. Thanks, Mohamad Raizudeen