From: Eric Biggers <ebiggers@google.com>
Date: Mon, 5 May 2025 18:18:22 +0000 (-0700)
Subject: crypto: lib/chacha - use struct assignment to copy state
X-Git-Tag: v6.16-rc1~206^2~58
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=32c9541189eb31ba6b25e2ff28e42660394a62af;p=thirdparty%2Fkernel%2Flinux.git

crypto: lib/chacha - use struct assignment to copy state

Use struct assignment instead of memcpy() in lib/crypto/chacha.c where
appropriate.  No functional change.

Signed-off-by: Eric Biggers <ebiggers@google.com>
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
---

diff --git a/lib/crypto/chacha.c b/lib/crypto/chacha.c
index a7f5eb0918394..ae50e441f9fbe 100644
--- a/lib/crypto/chacha.c
+++ b/lib/crypto/chacha.c
@@ -76,11 +76,9 @@ static void chacha_permute(struct chacha_state *state, int nrounds)
  */
 void chacha_block_generic(struct chacha_state *state, u8 *stream, int nrounds)
 {
-	struct chacha_state permuted_state;
+	struct chacha_state permuted_state = *state;
 	int i;
 
-	memcpy(permuted_state.x, state->x, 64);
-
 	chacha_permute(&permuted_state, nrounds);
 
 	for (i = 0; i < ARRAY_SIZE(state->x); i++)
@@ -105,9 +103,7 @@ EXPORT_SYMBOL(chacha_block_generic);
 void hchacha_block_generic(const struct chacha_state *state,
 			   u32 *stream, int nrounds)
 {
-	struct chacha_state permuted_state;
-
-	memcpy(permuted_state.x, state->x, 64);
+	struct chacha_state permuted_state = *state;
 
 	chacha_permute(&permuted_state, nrounds);