Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c3006976 authored by Eric Biggers's avatar Eric Biggers Committed by Greg Kroah-Hartman
Browse files

crypto: x86/ghash - fix unaligned access in ghash_setkey() 



[ Upstream commit 116db2704c193fff6d73ea6c2219625f0c9bdfc8 ]

The key can be unaligned, so use the unaligned memory access helpers.

Fixes: 8ceee728 ("crypto: ghash-clmulni-intel - use C implementation for setkey()")
Signed-off-by: default avatarEric Biggers <ebiggers@google.com>
Signed-off-by: default avatarHerbert Xu <herbert@gondor.apana.org.au>
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
parent 0c4f20c8

arch/x86/crypto/ghash-clmulni-intel_glue.c

+3 −3
Original line number Diff line number Diff line
@@ -19,6 +19,7 @@ 
#include <crypto/internal/simd.h>

#include <asm/cpu_device_id.h>

#include <asm/simd.h>

#include <asm/unaligned.h>



#define GHASH_BLOCK_SIZE	16

#define GHASH_DIGEST_SIZE	16
@@ -54,7 +55,6 @@ static int ghash_setkey(struct crypto_shash *tfm, 
			const u8 *key, unsigned int keylen)

{

	struct ghash_ctx *ctx = crypto_shash_ctx(tfm);

	be128 *x = (be128 *)key;

	u64 a, b;



	if (keylen != GHASH_BLOCK_SIZE) {
@@ -63,8 +63,8 @@ static int ghash_setkey(struct crypto_shash *tfm, 
	}



	/* perform multiplication by 'x' in GF(2^128) */

	a = be64_to_cpu(x->a);

	b = be64_to_cpu(x->b);

	a = get_unaligned_be64(key);

	b = get_unaligned_be64(key + 8);



	ctx->shash.a = (b << 1) | (a >> 63);

	ctx->shash.b = (a << 1) | (b >> 63);