Unverified Commit c2020692 authored by openeuler-ci-bot's avatar openeuler-ci-bot Committed by Gitee
Browse files

!14436 crypto: bcm - add error check in the ahash_hmac_init function 

Merge Pull Request from: @ci-robot 
 
PR sync from: Huang Xiaojia <huangxiaojia2@huawei.com>
https://mailweb.openeuler.org/hyperkitty/list/kernel@openeuler.org/message/CIQU2FPIG4PJ5NXLE7WI3F4DYTPZO2BM/ 
 
https://gitee.com/src-openeuler/kernel/issues/IBEDPO 
 
Link:https://gitee.com/openeuler/kernel/pulls/14436

 

Reviewed-by: default avatarZhang Jianhua <chris.zjh@huawei.com>
Reviewed-by: default avatarLi Nan <linan122@huawei.com>
Signed-off-by: default avatarLi Nan <linan122@huawei.com>
parents 0b8f0d9d 8a8e1fad

drivers/crypto/bcm/cipher.c

+4 −1
Original line number Diff line number Diff line
@@ -2418,6 +2418,7 @@ static int ahash_hmac_setkey(struct crypto_ahash *ahash, const u8 *key, 


static int ahash_hmac_init(struct ahash_request *req)

{

	int ret;

	struct iproc_reqctx_s *rctx = ahash_request_ctx(req);

	struct crypto_ahash *tfm = crypto_ahash_reqtfm(req);

	struct iproc_ctx_s *ctx = crypto_ahash_ctx(tfm);
@@ -2427,7 +2428,9 @@ static int ahash_hmac_init(struct ahash_request *req) 
	flow_log("ahash_hmac_init()\n");



	/* init the context as a hash */

	ahash_init(req);

	ret = ahash_init(req);

	if (ret)

		return ret;



	if (!spu_no_incr_hash(ctx)) {

		/* SPU-M can do incr hashing but needs sw for outer HMAC */