android/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

crypto: hisilicon/sec - fix auth key size error

Browse Source 
[ Upstream commit 45f5d0176d8426cc1ab0bab84fbd8ef5c57526c6 ]

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

Fixes: 2f072d75d1 ("crypto: hisilicon - Add aead support on SEC2")
Signed-off-by: Kai Ye <yekai13@huawei.com>
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
Signed-off-by: Sasha Levin <sashal@kernel.org>
This commit is contained in:
Kai Ye 2022-07-21 10:18:31 +08:00 committed by Greg Kroah-Hartman
parent 9524edb1a7
commit c206177ca8
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
drivers/crypto/hisilicon/sec2/sec_crypto.c
View File

@ -516,7 +516,7 @@ static int sec_auth_init(struct sec_ctx *ctx)
{ {
struct sec_auth_ctx *a_ctx = &ctx->a_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); &a_ctx->a_key_dma, GFP_KERNEL);
if (!a_ctx->a_key) if (!a_ctx->a_key)
return -ENOMEM; return -ENOMEM;
@ -528,8 +528,8 @@ static void sec_auth_uninit(struct sec_ctx *ctx)
{ {
struct sec_auth_ctx *a_ctx = &ctx->a_ctx; struct sec_auth_ctx *a_ctx = &ctx->a_ctx;
memzero_explicit(a_ctx->a_key, SEC_MAX_KEY_SIZE); memzero_explicit(a_ctx->a_key, SEC_MAX_AKEY_SIZE);
dma_free_coherent(ctx->dev, SEC_MAX_KEY_SIZE, dma_free_coherent(ctx->dev, SEC_MAX_AKEY_SIZE,
a_ctx->a_key, a_ctx->a_key_dma); a_ctx->a_key, a_ctx->a_key_dma);
} }

1
drivers/crypto/hisilicon/sec2/sec_crypto.h
View File

@ -6,6 +6,7 @@
#define SEC_IV_SIZE 24 #define SEC_IV_SIZE 24
#define SEC_MAX_KEY_SIZE 64 #define SEC_MAX_KEY_SIZE 64
#define SEC_MAX_AKEY_SIZE 128
#define SEC_COMM_SCENE 0 #define SEC_COMM_SCENE 0
enum sec_calg { enum sec_calg {