| From dda9ad4eac3fb2841470c3063cdb11e835636e47 Mon Sep 17 00:00:00 2001 |
| From: Sasha Levin <sashal@kernel.org> |
| Date: Thu, 1 Apr 2021 16:18:27 +0100 |
| Subject: crypto: sun8i-ss - Fix memory leak of pad |
| |
| From: Colin Ian King <colin.king@canonical.com> |
| |
| [ Upstream commit 50274b01ac1689b1a3f6bc4b5b3dbf361a55dd3a ] |
| |
| It appears there are several failure return paths that don't seem |
| to be free'ing pad. Fix these. |
| |
| Addresses-Coverity: ("Resource leak") |
| Fixes: d9b45418a917 ("crypto: sun8i-ss - support hash algorithms") |
| Signed-off-by: Colin Ian King <colin.king@canonical.com> |
| Acked-by: Corentin Labbe <clabbe.montjoie@gmail.com> |
| Tested-by: Corentin Labbe <clabbe.montjoie@gmail.com> |
| Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au> |
| Signed-off-by: Sasha Levin <sashal@kernel.org> |
| --- |
| drivers/crypto/allwinner/sun8i-ss/sun8i-ss-hash.c | 7 ++++--- |
| 1 file changed, 4 insertions(+), 3 deletions(-) |
| |
| diff --git a/drivers/crypto/allwinner/sun8i-ss/sun8i-ss-hash.c b/drivers/crypto/allwinner/sun8i-ss/sun8i-ss-hash.c |
| index 0b9aa24a5edd..64446b86c927 100644 |
| --- a/drivers/crypto/allwinner/sun8i-ss/sun8i-ss-hash.c |
| +++ b/drivers/crypto/allwinner/sun8i-ss/sun8i-ss-hash.c |
| @@ -348,8 +348,10 @@ int sun8i_ss_hash_run(struct crypto_engine *engine, void *breq) |
| bf = (__le32 *)pad; |
| |
| result = kzalloc(digestsize, GFP_KERNEL | GFP_DMA); |
| - if (!result) |
| + if (!result) { |
| + kfree(pad); |
| return -ENOMEM; |
| + } |
| |
| for (i = 0; i < MAX_SG; i++) { |
| rctx->t_dst[i].addr = 0; |
| @@ -435,10 +437,9 @@ int sun8i_ss_hash_run(struct crypto_engine *engine, void *breq) |
| dma_unmap_sg(ss->dev, areq->src, nr_sgs, DMA_TO_DEVICE); |
| dma_unmap_single(ss->dev, addr_res, digestsize, DMA_FROM_DEVICE); |
| |
| - kfree(pad); |
| - |
| memcpy(areq->result, result, algt->alg.hash.halg.digestsize); |
| theend: |
| + kfree(pad); |
| kfree(result); |
| crypto_finalize_hash_request(engine, breq, err); |
| return 0; |
| -- |
| 2.30.2 |
| |