Commit 45f5d017 authored by Kai Ye's avatar Kai Ye Committed by Herbert Xu
Browse files

crypto: hisilicon/sec - fix auth key size error 



The authentication algorithm supports a maximum of 128-byte keys.
The allocated key memory is insufficient.

Fixes: 2f072d75 ("crypto: hisilicon - Add aead support on SEC2")
Signed-off-by: default avatarKai Ye <yekai13@huawei.com>
Signed-off-by: default avatarHerbert Xu <herbert@gondor.apana.org.au>
parent 383ce25d

drivers/crypto/hisilicon/sec2/sec_crypto.c

+3 −3
Original line number Diff line number Diff line
@@ -620,7 +620,7 @@ static int sec_auth_init(struct sec_ctx *ctx) 
{

	struct sec_auth_ctx *a_ctx = &ctx->a_ctx;



	a_ctx->a_key = dma_alloc_coherent(ctx->dev, SEC_MAX_KEY_SIZE,

	a_ctx->a_key = dma_alloc_coherent(ctx->dev, SEC_MAX_AKEY_SIZE,

					  &a_ctx->a_key_dma, GFP_KERNEL);

	if (!a_ctx->a_key)

		return -ENOMEM;
@@ -632,8 +632,8 @@ static void sec_auth_uninit(struct sec_ctx *ctx) 
{

	struct sec_auth_ctx *a_ctx = &ctx->a_ctx;



	memzero_explicit(a_ctx->a_key, SEC_MAX_KEY_SIZE);

	dma_free_coherent(ctx->dev, SEC_MAX_KEY_SIZE,

	memzero_explicit(a_ctx->a_key, SEC_MAX_AKEY_SIZE);

	dma_free_coherent(ctx->dev, SEC_MAX_AKEY_SIZE,

			  a_ctx->a_key, a_ctx->a_key_dma);

}

drivers/crypto/hisilicon/sec2/sec_crypto.h

+1 −0
Original line number Diff line number Diff line
@@ -7,6 +7,7 @@ 
#define SEC_AIV_SIZE		12

#define SEC_IV_SIZE		24

#define SEC_MAX_KEY_SIZE	64

#define SEC_MAX_AKEY_SIZE	128

#define SEC_COMM_SCENE		0

#define SEC_MIN_BLOCK_SZ	1