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 332EF4BC010 for ; Mon, 5 Oct 2026 15:03:34 +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=1791212615; cv=none; b=ufkTWaQhgdt/rrVsV+y9xJMOqbzrjvlxsyKZmKIKX7/hZvVGHTtN/mNEDlco6RMfBbXN7glpAOj8gHXbheazXDPwIV6jY24mzfE6f7tYUTcwt9plw590qD+/NbOK0xUi+uEi1LGTH4H8f2C/iSALzpFlmImDWkc3P+ikAAMr1Sg= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1791212615; c=relaxed/simple; bh=NbwgF8HB32C6CTSgmUSYGhfsnpFr/uNAFvC75azPG9c=; h=From:To:Cc:Subject:Date:Message-ID:MIME-Version; b=qF6h8ADbYvZ/k+Mu3uV/NtmAXAaGhRqA5tPiu8CWPSzWIebOdAqSTpgf5+bzA8gdjjVYH+EM6a3ugfcNtTeyaUMugwTrR+WOkZaQZ2oSkaAy9GWzjThCy9F6yo6FRDKuygO1ayp6ojMYva4uRJwQhCby7zNAZ5RFlJ2jfwFyaOc= 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=GcbNFZbi; 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="GcbNFZbi" Received: by mail-dy2-f43.google.com with SMTP id 5a478bee46e88-3396cec93b6so2195493eec.3 for ; Mon, 05 Oct 2026 08:03:34 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1791212613; x=1791817413; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to:content-type; bh=w2wQ/G2NsTt77H0vEd1WVka3hOPCfr18QpjBWN9sEj4=; b=GcbNFZbizI55meM37dm2XA8jick7Z92BaOkS7D4DZc2bw9cXSBqhJNxQZo0y6sbdi7 VcBv/HhETpI1AsRPtv0UZJaGJV1uVF8tnNG6+xrxEIbYI54+dxLCSJsbXu5+fzxLzNxX jDcxh5kjfYqcWU6dpGYvu/xak9FmAloNivUXuth4wB3HqccGEIDg3ORxTWNfycWr7YYn xxzg8gGrcduY1332VHEq41/eftRMEq1cw7z+WW4e2BvjTGm0k7mJbFDHGHxmjyHnLv8d d+H/RUxZ4gjVs9iOGe5GRxBpXDaWdtWwK8aqJoAmrhPxXh3CkwgAHfCCbAZljgNzo42C n35w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20260707; t=1791212613; x=1791817413; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-gg:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to:content-type; bh=w2wQ/G2NsTt77H0vEd1WVka3hOPCfr18QpjBWN9sEj4=; b=R+TNGUzFmOMnoQTjNAtayLhfXYDfzDjnCa5eRIVVfRnseP1gwPdcVRMlolgbJ4TDC4 NLddaKuoVHgXlVo8oV+fhmJj1gaFUfsWQiP+UEW3BlZ2rp7RU2ir6dV72EkiyNnGslyt GqGmK2qhd5lWJvwBq44uKAhTxJPm0rrwuZGJrEQ+gXHbUJoNstVo/ETFZyhcchEj4Hga fH/e0dwUdRyZ0HehmS26uI/TCcgPLV5AWT0YqrKn/bnvkXhQQYyx2AIlLwqkmeAa45Mq /9zeelWAUbZS3/CDWEhqUn6tRcM8YdRPNjTuAhg8oaEPv0L7IX5HXh0AKXgp4v3s8IJV fXug== X-Forwarded-Encrypted: i=1; AKwUvBzRXZqdhWx+S4lQkNxLc5rg2XMzBZJ/bhWVJHbMYIMHhIMrMXofoG7Jbargtf2WVi8yVYYLEO5tl76Mqfo=@vger.kernel.org X-Gm-Message-State: AFuF++lE8zoSF4biPtvukxQD7EU+SKJp/xoOex/4HFk4B1gO46kdXaHh HOLmPo3u5+KCdzbz44Og/ZyHvhmzK9FxFNj9HqKhJnEL5wDLOM17scnp X-Gm-Gg: AYBFou3+fIqkqh+KzpwpD0JkPdeXnt0E8JBUco1z2qAbNgV9cyJrwwTyZE2ICi4obY4 m7JIDVwgcqgZzvptg1X6dgOXWu6dlcJy6PG0xK3Jh4EoA6WzIMHCC1fjW1sZKx3Ju5CVJLU3ZL+ e6FJAXwkZX1wcRA3ce75iMieLeyqlA5DTFgyptmpBJfzUVZQHSx5qbeim6h1oMU/z0enx88iaCH rO1O4aJBZ5N1PZUZ11j5X4YM9UOZfAu2wKdnLX7N1SPf+G+mq/XNC1py0j+8xWSJz6tIFcFkxq0 BCH8VJw/YPr1klFeIdelVPdrkmYz+wpZSWhWrd+qbVHpts+J2z7weXhNPtgiRM9vH9A5hQAlHXs 8JG4HS1U1oDrLZTgOfV+s2wBTM6JdD7Vowhrsnf/fy4Yc/5CSCuzOYcmKSJDnxICixIgVqfrrQN HXuwVnjZOBrmKjOA8cWVmuN6T4dG3rCr5UQgXfmtuMZdj3UtQ/bPybOCbF7Gi7Oy35WGz2l+TNp CAIHVKd5DQcBs4XOg== X-Received: by 2002:a05:693c:41d6:10b0:342:451b:c0cc with SMTP id 5a478bee46e88-34f1509e598mr13877273eec.6.1791212611886; Mon, 05 Oct 2026 08:03:31 -0700 (PDT) Received: from kernel ([103.219.206.73]) by smtp.gmail.com with ESMTPSA id 5a478bee46e88-351272a9360sm14886789eec.23.2026.10.05.08.03.27 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 05 Oct 2026 08:03:31 -0700 (PDT) From: Mohamad Raizudeen To: ebiggers@kernel.org, ardb@kernel.org, Jason@zx2c4.com Cc: skhan@linuxfoundation.org, me@brighamcampbell.com, jkoolstra@xs4all.nl, linux-crypto@vger.kernel.org, linux-kernel@vger.kernel.org, Mohamad Raizudeen Subject: [PATCH v3] lib/crypto: chacha20poly1305: zeroize state in __chacha20poly1305_decrypt Date: Mon, 5 Oct 2026 20:33:24 +0530 Message-ID: <20261005150324.5621-1-raizudeen.kerneldev@gmail.com> X-Mailer: git-send-email 2.53.0 Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 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, leaving the derived chacha20 subkey on the stack. Because this function is EXPORT_SYMBOL()ed, this is an ABI robustness improvement. To ensure consistent and safe cleanup for any future callers, move the chacha_zeroize_state() call into `__chacha20poly1305_decrypt()` itself, so the helper cleans up after its own state just like `__chacha20poly1305_encrypt()` does. Additionally, moved the src_len check to the callers so the state is not initialized on invalid inputs, matching the logic in chacha20poly1305_crypt_sg_inplace(). Suggested-by: Ard Biesheuvel Signed-off-by: Mohamad Raizudeen --- Changes in v3: - Remove Fixes and Cc: stable tags, as this is an ABI robustness improvement rather than a fix. - Move the src_len check to the callers so the state is not initialized on invalid inputs. - Fix whitespace and ordering of the chacha_zeroize_state() to match chacha20poly1305_crypt_sg_inplace(). Link to v2: https://lore.kernel.org/all/asMfBGbckJAhCa45@kernel/T/ lib/crypto/chacha20poly1305.c | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/lib/crypto/chacha20poly1305.c b/lib/crypto/chacha20poly1305.c index ea42a28f4ff7..c3995ac8acb7 100644 --- a/lib/crypto/chacha20poly1305.c +++ b/lib/crypto/chacha20poly1305.c @@ -137,9 +137,6 @@ __chacha20poly1305_decrypt(u8 *dst, const u8 *src, const size_t src_len, __le64 lens[2]; } b; - if (unlikely(src_len < POLY1305_DIGEST_SIZE)) - return false; - chacha20_crypt(chacha_state, b.block0, pad0, sizeof(b.block0)); poly1305_init(&poly1305_state, b.block0); @@ -162,6 +159,7 @@ __chacha20poly1305_decrypt(u8 *dst, const u8 *src, const size_t src_len, if (likely(!ret)) chacha20_crypt(chacha_state, dst, src, dst_len); + chacha_zeroize_state(chacha_state); memzero_explicit(&b, sizeof(b)); return !ret; @@ -177,6 +175,9 @@ bool chacha20poly1305_decrypt(u8 *dst, const u8 *src, const size_t src_len, __le64 iv[2]; bool ret; + if (unlikely(src_len < POLY1305_DIGEST_SIZE)) + return false; + chacha_load_key(k, key); iv[0] = 0; @@ -186,7 +187,6 @@ bool chacha20poly1305_decrypt(u8 *dst, const u8 *src, const size_t src_len, ret = __chacha20poly1305_decrypt(dst, src, src_len, ad, ad_len, &chacha_state); - chacha_zeroize_state(&chacha_state); memzero_explicit(iv, sizeof(iv)); memzero_explicit(k, sizeof(k)); return ret; @@ -200,6 +200,9 @@ bool xchacha20poly1305_decrypt(u8 *dst, const u8 *src, const size_t src_len, { struct chacha_state chacha_state; + if (unlikely(src_len < POLY1305_DIGEST_SIZE)) + return false; + xchacha_init(&chacha_state, key, nonce); return __chacha20poly1305_decrypt(dst, src, src_len, ad, ad_len, &chacha_state); -- 2.53.0