Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b2744dfd authored by Alex Porosanu's avatar Alex Porosanu Committed by Herbert Xu
Browse files

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



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: default avatarAlex Porosanu <alexandru.porosanu@freescale.com>
Signed-off-by: default avatarHerbert Xu <herbert@gondor.apana.org.au>
parent d5e4e999

drivers/crypto/caam/caamalg.c

+7 −0
Original line number Diff line number Diff line
@@ -2209,6 +2209,13 @@ static int __init caam_algapi_init(void) 
	priv = dev_get_drvdata(ctrldev);

	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);



	atomic_set(&priv->tfm_count, -1);

drivers/crypto/caam/caamhash.c

+7 −0
Original line number Diff line number Diff line
@@ -1833,6 +1833,13 @@ static int __init caam_algapi_hash_init(void) 
	priv = dev_get_drvdata(ctrldev);

	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);



	atomic_set(&priv->tfm_count, -1);

drivers/crypto/caam/caamrng.c

+7 −0
Original line number Diff line number Diff line
@@ -298,6 +298,13 @@ static int __init caam_rng_init(void) 
	priv = dev_get_drvdata(ctrldev);

	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]);



	dev_info(priv->jrdev[0], "registering rng-caam\n");