Skip to content

Commit e504682

Browse files
author
Eric Biggers
committed
lib/crypto: chacha: Zeroize permuted_state before it leaves scope
Since the ChaCha permutation is invertible, the local variable 'permuted_state' is sufficient to compute the original 'state', and thus the key, even after the permutation has been done. While the kernel is quite inconsistent about zeroizing secrets on the stack (and some prominent userspace crypto libraries don't bother at all since it's not guaranteed to work anyway), the kernel does try to do it as a best practice, especially in cases involving the RNG. Thus, explicitly zeroize 'permuted_state' before it goes out of scope. Fixes: c08d0e6 ("crypto: chacha20 - Add a generic ChaCha20 stream cipher implementation") Cc: stable@vger.kernel.org Acked-by: Ard Biesheuvel <ardb@kernel.org> Link: https://lore.kernel.org/r/20260326032920.39408-1-ebiggers@kernel.org Signed-off-by: Eric Biggers <ebiggers@kernel.org>
1 parent c369299 commit e504682

File tree

1 file changed

+4
-0
lines changed

1 file changed

+4
-0
lines changed

lib/crypto/chacha-block-generic.c

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -87,6 +87,8 @@ void chacha_block_generic(struct chacha_state *state,
8787
&out[i * sizeof(u32)]);
8888

8989
state->x[12]++;
90+
91+
chacha_zeroize_state(&permuted_state);
9092
}
9193
EXPORT_SYMBOL(chacha_block_generic);
9294

@@ -110,5 +112,7 @@ void hchacha_block_generic(const struct chacha_state *state,
110112

111113
memcpy(&out[0], &permuted_state.x[0], 16);
112114
memcpy(&out[4], &permuted_state.x[12], 16);
115+
116+
chacha_zeroize_state(&permuted_state);
113117
}
114118
EXPORT_SYMBOL(hchacha_block_generic);

0 commit comments

Comments
 (0)