Commit 982fd1a7 authored by Zhiqi Song's avatar Zhiqi Song Committed by Herbert Xu
Browse files

crypto: hisilicon/hpre - fix dma unmap sequence 



Perform DMA unmapping operations before processing data.
Otherwise, there may be unsynchronized data accessed by
the CPU when the SWIOTLB is enabled.

Signed-off-by: default avatarZhiqi Song <songzhiqi1@huawei.com>
Signed-off-by: default avatarChenghai Huang <huangchenghai2@huawei.com>
Signed-off-by: default avatarHerbert Xu <herbert@gondor.apana.org.au>
parent 301eee1c

drivers/crypto/hisilicon/hpre/hpre_crypto.c

+6 −2
Original line number Diff line number Diff line
@@ -1491,11 +1491,13 @@ static void hpre_ecdh_cb(struct hpre_ctx *ctx, void *resp) 
	if (overtime_thrhld && hpre_is_bd_timeout(req, overtime_thrhld))

		atomic64_inc(&dfx[HPRE_OVER_THRHLD_CNT].value);



	/* Do unmap before data processing */

	hpre_ecdh_hw_data_clr_all(ctx, req, areq->dst, areq->src);



	p = sg_virt(areq->dst);

	memmove(p, p + ctx->key_sz - curve_sz, curve_sz);

	memmove(p + curve_sz, p + areq->dst_len - curve_sz, curve_sz);



	hpre_ecdh_hw_data_clr_all(ctx, req, areq->dst, areq->src);

	kpp_request_complete(areq, ret);



	atomic64_inc(&dfx[HPRE_RECV_CNT].value);
@@ -1808,9 +1810,11 @@ static void hpre_curve25519_cb(struct hpre_ctx *ctx, void *resp) 
	if (overtime_thrhld && hpre_is_bd_timeout(req, overtime_thrhld))

		atomic64_inc(&dfx[HPRE_OVER_THRHLD_CNT].value);



	/* Do unmap before data processing */

	hpre_curve25519_hw_data_clr_all(ctx, req, areq->dst, areq->src);



	hpre_key_to_big_end(sg_virt(areq->dst), CURVE25519_KEY_SIZE);



	hpre_curve25519_hw_data_clr_all(ctx, req, areq->dst, areq->src);

	kpp_request_complete(areq, ret);



	atomic64_inc(&dfx[HPRE_RECV_CNT].value);