]> git.kernelconcepts.de Git - karo-tx-linux.git/commitdiff
crypto: caam - fix mem leak in ahash_setkey
authorHoria Geanta <horia.geanta@freescale.com>
Fri, 18 Apr 2014 10:01:41 +0000 (13:01 +0300)
committerHerbert Xu <herbert@gondor.apana.org.au>
Mon, 28 Apr 2014 10:21:16 +0000 (18:21 +0800)
In case hash key is bigger than algorithm block size, it is hashed.
In this case, memory is allocated to keep this hash in hashed_key.
hashed_key has to be freed on the key_dma dma mapping error path.

Signed-off-by: Horia Geanta <horia.geanta@freescale.com>
Reviewed-by: Marek Vasut <marex@denx.de>
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
drivers/crypto/caam/caamhash.c

index 0378328f47a775b368b795cd3d7adc9b678fd31b..2d244e629ed2e514a9830bca1d99a7b064e2ecb0 100644 (file)
@@ -545,7 +545,8 @@ static int ahash_setkey(struct crypto_ahash *ahash,
                                      DMA_TO_DEVICE);
        if (dma_mapping_error(jrdev, ctx->key_dma)) {
                dev_err(jrdev, "unable to map key i/o memory\n");
-               return -ENOMEM;
+               ret = -ENOMEM;
+               goto map_err;
        }
 #ifdef DEBUG
        print_hex_dump(KERN_ERR, "ctx.key@"__stringify(__LINE__)": ",
@@ -559,6 +560,7 @@ static int ahash_setkey(struct crypto_ahash *ahash,
                                 DMA_TO_DEVICE);
        }
 
+map_err:
        kfree(hashed_key);
        return ret;
 badkey: