From 1dfb15e6420b023b3ed479563c818d2e75203067 Mon Sep 17 00:00:00 2001 From: Thorsten Blum Date: Mon, 21 Sep 2026 08:11:21 +0200 Subject: [PATCH] crypto: cast6 - use memcpy_and_pad() in __cast6_setkey() Use memcpy_and_pad() instead of separate memcpy() and memset() calls to simplify __cast6_setkey(). Signed-off-by: Thorsten Blum Signed-off-by: Herbert Xu --- crypto/cast6_generic.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/crypto/cast6_generic.c b/crypto/cast6_generic.c index 4c08c42646f0..9b6bdd2aa511 100644 --- a/crypto/cast6_generic.c +++ b/crypto/cast6_generic.c @@ -112,8 +112,7 @@ int __cast6_setkey(struct cast6_ctx *c, const u8 *in_key, unsigned int key_len) if (key_len % 4 != 0) return -EINVAL; - memset(p_key, 0, 32); - memcpy(p_key, in_key, key_len); + memcpy_and_pad(p_key, sizeof(p_key), in_key, key_len, 0); key[0] = be32_to_cpu(p_key[0]); /* A */ key[1] = be32_to_cpu(p_key[1]); /* B */