Browse Source

crypto: caam - Fix error handling in caam_rng_init()

In the error paths we should free the resources that were
previously acquired, so fix it accordingly.

Signed-off-by: Fabio Estevam <fabio.estevam@freescale.com>
Reviewed-by: Horia Geant? <horia.geanta@freescale.com>
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
Fabio Estevam 10 years ago
parent
commit
ac8ad30777
1 changed files with 11 additions and 3 deletions
  1. 11 3
      drivers/crypto/caam/caamrng.c

+ 11 - 3
drivers/crypto/caam/caamrng.c

@@ -352,14 +352,22 @@ static int __init caam_rng_init(void)
 		return PTR_ERR(dev);
 		return PTR_ERR(dev);
 	}
 	}
 	rng_ctx = kmalloc(sizeof(struct caam_rng_ctx), GFP_DMA);
 	rng_ctx = kmalloc(sizeof(struct caam_rng_ctx), GFP_DMA);
-	if (!rng_ctx)
-		return -ENOMEM;
+	if (!rng_ctx) {
+		err = -ENOMEM;
+		goto free_caam_alloc;
+	}
 	err = caam_init_rng(rng_ctx, dev);
 	err = caam_init_rng(rng_ctx, dev);
 	if (err)
 	if (err)
-		return err;
+		goto free_rng_ctx;
 
 
 	dev_info(dev, "registering rng-caam\n");
 	dev_info(dev, "registering rng-caam\n");
 	return hwrng_register(&caam_rng);
 	return hwrng_register(&caam_rng);
+
+free_rng_ctx:
+	kfree(rng_ctx);
+free_caam_alloc:
+	caam_jr_free(dev);
+	return err;
 }
 }
 
 
 module_init(caam_rng_init);
 module_init(caam_rng_init);