crypto: sun8i-ce - fix two error path's memory leak

[linux-2.6-microblaze.git] / drivers / crypto / allwinner / sun8i-ce / sun8i-ce-hash.c

diff --git a/drivers/crypto/allwinner/sun8i-ce/sun8i-ce-hash.c b/drivers/crypto/allwinner/sun8i-ce/sun8i-ce-hash.c
index 4927a6c..7ca4979 100644 (file)
--- a/drivers/crypto/allwinner/sun8i-ce/sun8i-ce-hash.c
+++ b/drivers/crypto/allwinner/sun8i-ce/sun8i-ce-hash.c
@@ -263,13 +263,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;
@@ -286,13 +286,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];
@@ -404,11 +408,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;
 }