Commit cc0aaae3 authored by Kai Ye's avatar Kai Ye Committed by Zheng Zengkai
Browse files

crypto: hisilicon/sec2 - Fix aead authentication setting key error 

mainline inclusion
from mainline-v5.11-rc1
commit 5761498c
category: bugfix
bugzilla: 173981
CVE: NA

Reference: https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=5761498c4d074560b38a203000afc6e971ffaa7f



----------------------------------------------------------------------

Fix aead auth setting key process error. if use soft shash function, driver
need to use digest size replace of the user input key length.

Signed-off-by: default avatarKai Ye <yekai13@huawei.com>
Signed-off-by: default avatarHerbert Xu <herbert@gondor.apana.org.au>
Signed-off-by: default avatarMingqiang Ling <lingmingqiang@huawei.com>
Signed-off-by: default avatarZheng Zengkai <zhengzengkai@huawei.com>
parent e04728ed

drivers/crypto/hisilicon/sec2/sec_crypto.c

+3 −2
Original line number Diff line number Diff line
@@ -857,7 +857,7 @@ static int sec_aead_auth_set_key(struct sec_auth_ctx *ctx, 
				 struct crypto_authenc_keys *keys)

{

	struct crypto_shash *hash_tfm = ctx->hash_tfm;

	int blocksize, ret;

	int blocksize, digestsize, ret;



	if (!keys->authkeylen) {

		pr_err("hisi_sec2: aead auth key error!\n");
@@ -865,6 +865,7 @@ static int sec_aead_auth_set_key(struct sec_auth_ctx *ctx, 
	}



	blocksize = crypto_shash_blocksize(hash_tfm);

	digestsize = crypto_shash_digestsize(hash_tfm);

	if (keys->authkeylen > blocksize) {

		ret = crypto_shash_tfm_digest(hash_tfm, keys->authkey,

					      keys->authkeylen, ctx->a_key);
@@ -872,7 +873,7 @@ static int sec_aead_auth_set_key(struct sec_auth_ctx *ctx, 
			pr_err("hisi_sec2: aead auth digest error!\n");

			return -EINVAL;

		}

		ctx->a_key_len = blocksize;

		ctx->a_key_len = digestsize;

	} else {

		memcpy(ctx->a_key, keys->authkey, keys->authkeylen);

		ctx->a_key_len = keys->authkeylen;