2021-04-10 09:53:01

by Hui Tang

Subject: [PATCH] crypto: hisilicon/hpre - fix unmapping invalid dma address

Currently, an invalid dma address may be unmapped when calling
'xx_data_clr_all' in error path, so check dma address of sqe in/out
whether it has been mapped before calling 'dma_free_coherent' or
'dma_unmap_single'.

An abnormal case is as follows:
hpre_curve25519_compute_value
-> hpre_curve25519_src_init
-> hpre_curve25519_hw_data_clr_all

Fixes: a9214b0b6ed2(crypto: hisilicon - fix the check on dma address)
Signed-off-by: Hui Tang <[email protected]>
---
drivers/crypto/hisilicon/hpre/hpre_crypto.c | 18 ++++++++++++++++++
1 file changed, 18 insertions(+)

diff --git a/drivers/crypto/hisilicon/hpre/hpre_crypto.c b/drivers/crypto/hisilicon/hpre/hpre_crypto.c
index f363653..d23893a 100644
--- a/drivers/crypto/hisilicon/hpre/hpre_crypto.c
+++ b/drivers/crypto/hisilicon/hpre/hpre_crypto.c
@@ -298,6 +298,8 @@ static void hpre_hw_data_clr_all(struct hpre_ctx *ctx,
dma_addr_t tmp;

tmp = le64_to_cpu(sqe->in);
+ if (unlikely(dma_mapping_error(dev, tmp)))
+ return;

if (src) {
if (req->src)
@@ -307,6 +309,8 @@ static void hpre_hw_data_clr_all(struct hpre_ctx *ctx,
}

tmp = le64_to_cpu(sqe->out);
+ if (unlikely(dma_mapping_error(dev, tmp)))
+ return;

if (req->dst) {
if (dst)
@@ -517,6 +521,8 @@ static int hpre_msg_request_set(struct hpre_ctx *ctx, void *req, bool is_rsa)
msg->key = cpu_to_le64(ctx->dh.dma_xa_p);
}

+ msg->in = DMA_MAPPING_ERROR;
+ msg->out = DMA_MAPPING_ERROR;
msg->dw0 |= cpu_to_le32(0x1 << HPRE_SQE_DONE_SHIFT);
msg->task_len1 = (ctx->key_sz >> HPRE_BITS_2_BYTES_SHIFT) - 1;
h_req->ctx = ctx;
@@ -1365,11 +1371,15 @@ static void hpre_ecdh_hw_data_clr_all(struct hpre_ctx *ctx,
dma_addr_t dma;

dma = le64_to_cpu(sqe->in);
+ if (unlikely(dma_mapping_error(dev, dma)))
+ return;

if (src && req->src)
dma_free_coherent(dev, ctx->key_sz << 2, req->src, dma);

dma = le64_to_cpu(sqe->out);
+ if (unlikely(dma_mapping_error(dev, dma)))
+ return;

if (req->dst)
dma_free_coherent(dev, ctx->key_sz << 1, req->dst, dma);
@@ -1424,6 +1434,8 @@ static int hpre_ecdh_msg_request_set(struct hpre_ctx *ctx,
h_req->areq.ecdh = req;
msg = &h_req->req;
memset(msg, 0, sizeof(*msg));
+ msg->in = DMA_MAPPING_ERROR;
+ msg->out = DMA_MAPPING_ERROR;
msg->key = cpu_to_le64(ctx->ecdh.dma_p);

msg->dw0 |= cpu_to_le32(0x1U << HPRE_SQE_DONE_SHIFT);
@@ -1660,11 +1672,15 @@ static void hpre_curve25519_hw_data_clr_all(struct hpre_ctx *ctx,
dma_addr_t dma;

dma = le64_to_cpu(sqe->in);
+ if (unlikely(dma_mapping_error(dev, dma)))
+ return;

if (src && req->src)
dma_free_coherent(dev, ctx->key_sz, req->src, dma);

dma = le64_to_cpu(sqe->out);
+ if (unlikely(dma_mapping_error(dev, dma)))
+ return;

if (req->dst)
dma_free_coherent(dev, ctx->key_sz, req->dst, dma);
@@ -1715,6 +1731,8 @@ static int hpre_curve25519_msg_request_set(struct hpre_ctx *ctx,
h_req->areq.curve25519 = req;
msg = &h_req->req;
memset(msg, 0, sizeof(*msg));
+ msg->in = DMA_MAPPING_ERROR;
+ msg->out = DMA_MAPPING_ERROR;
msg->key = cpu_to_le64(ctx->curve25519.dma_p);

msg->dw0 |= cpu_to_le32(0x1U << HPRE_SQE_DONE_SHIFT);
--
2.8.1

2021-04-16 11:39:33

by Herbert Xu

Subject: Re: [PATCH] crypto: hisilicon/hpre - fix unmapping invalid dma address

On Sat, Apr 10, 2021 at 05:49:17PM +0800, Hui Tang wrote:
> Currently, an invalid dma address may be unmapped when calling
> 'xx_data_clr_all' in error path, so check dma address of sqe in/out
> whether it has been mapped before calling 'dma_free_coherent' or
> 'dma_unmap_single'.
>
> An abnormal case is as follows:
> hpre_curve25519_compute_value
> -> hpre_curve25519_src_init
> -> hpre_curve25519_hw_data_clr_all
>
> Fixes: a9214b0b6ed2(crypto: hisilicon - fix the check on dma address)
> Signed-off-by: Hui Tang <[email protected]>
> ---
> drivers/crypto/hisilicon/hpre/hpre_crypto.c | 18 ++++++++++++++++++
> 1 file changed, 18 insertions(+)

This triggers new sparse warnings.

Cheers,
--
Email: Herbert Xu <[email protected]>
Home Page: http://gondor.apana.org.au/~herbert/
PGP Key: http://gondor.apana.org.au/~herbert/pubkey.txt

2021-04-19 11:51:43

by Hui Tang

Subject: Re: [PATCH] crypto: hisilicon/hpre - fix unmapping invalid dma address

On 2021/4/16 19:26, Herbert Xu wrote:
> On Sat, Apr 10, 2021 at 05:49:17PM +0800, Hui Tang wrote:
>> Currently, an invalid dma address may be unmapped when calling
>> 'xx_data_clr_all' in error path, so check dma address of sqe in/out
>> whether it has been mapped before calling 'dma_free_coherent' or
>> 'dma_unmap_single'.
>>
>> An abnormal case is as follows:
>> hpre_curve25519_compute_value
>> -> hpre_curve25519_src_init
>> -> hpre_curve25519_hw_data_clr_all
>>
>> Fixes: a9214b0b6ed2(crypto: hisilicon - fix the check on dma address)
>> Signed-off-by: Hui Tang <[email protected]>
>> ---
>> drivers/crypto/hisilicon/hpre/hpre_crypto.c | 18 ++++++++++++++++++
>> 1 file changed, 18 insertions(+)
>
> This triggers new sparse warnings.

Thanks, I will fix it in 5.13 rc1.