iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

crypto: caam - fix hash, alg and rng registration if CAAM driver not initialized

Browse Source 
If the CAAM driver initialization failed (due to various reasons, e.g. RNG4
initialization failed), then the registration of hash/algorithms/rng shouldn't
take place. This patch adds the necessary code to prevent this registration.

Signed-off-by: Alex Porosanu <alexandru.porosanu@freescale.com>
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
This commit is contained in:
Alex Porosanu 2013-09-09 18:56:29 +03:00 committed by Herbert Xu
parent d5e4e999cd
commit b2744dfd39
3 changed files with 21 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
drivers/crypto/caam/caamalg.c
View File

@ -2209,6 +2209,13 @@ static int __init caam_algapi_init(void)
priv = dev_get_drvdata(ctrldev); priv = dev_get_drvdata(ctrldev);
of_node_put(dev_node); of_node_put(dev_node);
/*
* If priv is NULL, it's probably because the caam driver wasn't
* properly initialized (e.g. RNG4 init failed). Thus, bail out here.
*/
if (!priv)
return -ENODEV;
INIT_LIST_HEAD(&priv->alg_list); INIT_LIST_HEAD(&priv->alg_list);
atomic_set(&priv->tfm_count, -1); atomic_set(&priv->tfm_count, -1);

7
drivers/crypto/caam/caamhash.c
View File

@ -1833,6 +1833,13 @@ static int __init caam_algapi_hash_init(void)
priv = dev_get_drvdata(ctrldev); priv = dev_get_drvdata(ctrldev);
of_node_put(dev_node); of_node_put(dev_node);
/*
* If priv is NULL, it's probably because the caam driver wasn't
* properly initialized (e.g. RNG4 init failed). Thus, bail out here.
*/
if (!priv)
return -ENODEV;
INIT_LIST_HEAD(&priv->hash_list); INIT_LIST_HEAD(&priv->hash_list);
atomic_set(&priv->tfm_count, -1); atomic_set(&priv->tfm_count, -1);

7
drivers/crypto/caam/caamrng.c
View File

@ -298,6 +298,13 @@ static int __init caam_rng_init(void)
priv = dev_get_drvdata(ctrldev); priv = dev_get_drvdata(ctrldev);
of_node_put(dev_node); of_node_put(dev_node);
/*
* If priv is NULL, it's probably because the caam driver wasn't
* properly initialized (e.g. RNG4 init failed). Thus, bail out here.
*/
if (!priv)
return -ENODEV;
caam_init_rng(&rng_ctx, priv->jrdev[0]); caam_init_rng(&rng_ctx, priv->jrdev[0]);
dev_info(priv->jrdev[0], "registering rng-caam\n"); dev_info(priv->jrdev[0], "registering rng-caam\n");