2015-08-12 14:49:05

by Fabio Estevam

Subject: [PATCH] crypto: caam - Fix error handling in caam_rng_init()

From: Fabio Estevam <[email protected]>

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

Signed-off-by: Fabio Estevam <[email protected]>
---
drivers/crypto/caam/caamrng.c | 14 +++++++++++---
1 file changed, 11 insertions(+), 3 deletions(-)

diff --git a/drivers/crypto/caam/caamrng.c b/drivers/crypto/caam/caamrng.c
index 345024c..fb0cc54 100644
--- a/drivers/crypto/caam/caamrng.c
+++ b/drivers/crypto/caam/caamrng.c
@@ -352,14 +352,22 @@ static int __init caam_rng_init(void)
return PTR_ERR(dev);
}
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);
if (err)
- return err;
+ goto free_rng_ctx;

dev_info(dev, "registering rng-caam\n");
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);
--
1.9.1

2015-08-12 17:30:20

by Horia Geantă

Subject: Re: [PATCH] crypto: caam - Fix error handling in caam_rng_init()

On 8/12/2015 5:48 PM, Fabio Estevam wrote:
> From: Fabio Estevam <[email protected]>
>
> In the error paths we should free the resources that were
> previously acquired, so fix it accordingly.
>
> Signed-off-by: Fabio Estevam <[email protected]>

Reviewed-by: Horia Geantă <[email protected]>

Thanks,
Horia

2015-08-13 07:17:38

by Herbert Xu

Subject: Re: [PATCH] crypto: caam - Fix error handling in caam_rng_init()

On Wed, Aug 12, 2015 at 11:48:42AM -0300, Fabio Estevam wrote:
> From: Fabio Estevam <[email protected]>
>
> In the error paths we should free the resources that were
> previously acquired, so fix it accordingly.
>
> Signed-off-by: Fabio Estevam <[email protected]>

Applied.
--
Email: Herbert Xu <[email protected]>
Home Page: http://gondor.apana.org.au/~herbert/
PGP Key: http://gondor.apana.org.au/~herbert/pubkey.txt