crypto: allwinner: sun8i-ce: fix two error path's memory leak
PATCH 1/1 crypto: allwinner: sun8i-ce: fix two error path's memory leak
This patch fixes the following smatch warnings:drivers/crypto/allwinner/sun8i-ce/sun8i-ce-hash.c:412 sun8i_ce_hash_run() warn: possible memory leak of 'result'
Note: "buf" is leaked as well.
Furthermore, in case of ENOMEM, crypto_finalize_hash_request() was not called which was an error.
Fixes 56f6d5aee88d ("crypto: sun8i-ce - support hash algorithms")
Reported-by kernel test robot <[email protected]>
Reported-by Dan Carpenter <[email protected]>
Signed-off-by Corentin Labbe <[email protected]>
--- .../crypto/allwinner/sun8i-ce/sun8i-ce-hash.c | 20 +++++++++++-------- 1 file changed, 12 insertions(+), 8 deletions(-)
drivers/crypto/allwinner/sun8i-ce/sun8i-ce-hash.c +12 -8
@@ -262,13 +262,13 @@ int sun8i_ce_hash_run(struct crypto_engine *engine, void *breq)u32 common;u64 byte_count;__le32 *bf; -void *buf; +void *buf =NULL ;int j, i, todo;int nbw =0 ;u64 fill, min_fill;__be64 *bebits;__le64 *lebits; -void *result; +void *result =NULL ;u64 bs;int digestsize;dma_addr_t addr_res, addr_pad;
@@ -285,13 +285,17 @@ int sun8i_ce_hash_run(struct crypto_engine *engine, void *breq)/* the padding could be up to two block. */ buf =kzalloc (bs *2 ,GFP_KERNEL |GFP_DMA ); -if (!buf) -return -ENOMEM ; +if (!buf) { + err = -ENOMEM ; + goto theend; + } bf = (__le32 *)buf; result =kzalloc (digestsize,GFP_KERNEL |GFP_DMA ); -if (!result) -return -ENOMEM ; +if (!result) { + err = -ENOMEM ; + goto theend; + } flow = rctx->flow; chan = &ce->chanlist[flow];
@@ -403,11 +407,11 @@ int sun8i_ce_hash_run(struct crypto_engine *engine, void *breq)dma_unmap_sg (ce->dev, areq->src, nr_sgs,DMA_TO_DEVICE );dma_unmap_single (ce->dev, addr_res, digestsize,DMA_FROM_DEVICE ); -kfree (buf);memcpy (areq->result, result, algt->alg.hash.halg.digestsize); -kfree (result); theend: +kfree (buf); +kfree (result);crypto_finalize_hash_request (engine, breq, err);return 0 ; }
Signature · 1 line
2.26.2
Herbert Xu
maintainerQuoted 8 lines · Corentin Labbe
This patch fixes the following smatch warnings:
drivers/crypto/allwinner/sun8i-ce/sun8i-ce-hash.c:412sun8i_ce_hash_run()warn: possible memory leak of 'result'
Note: "buf" is leaked as well.Furthermore, in case of ENOMEM,
crypto_finalize_hash_request()was not called which was an error.
Quoted 7 lines
Fixes 56f6d5aee88d ("crypto: sun8i-ce - support hash algorithms")Reported-by kernel test robot <[email protected]>Reported-by Dan Carpenter <[email protected]>Signed-off-by Corentin Labbe <[email protected]>--- .../crypto/allwinner/sun8i-ce/sun8i-ce-hash.c | 20 +++++++++++-------- 1 file changed, 12 insertions(+), 8 deletions(-)
Patch applied. Thanks.
Signature · 3 lines
Email: Herbert Xu <[email protected]> Home Page: http://gondor.apana.org.au/~herbert/ PGP Key: http://gondor.apana.org.au/~herbert/pubkey.txt