On Fri, 2014-07-04 at 17:10 +0530, Ruchika Gupta wrote:
> The layer which registers with the crypto API should check for the presence of
> the CAAM device it is going to use. If the platform's device tree doesn't
> have
> the required CAAM node, the layer should return an error and not register the
> algorithms with crypto API layer.
>
> Signed-off-by: Ruchika Gupta <[email protected]>
> Reviewed-by: Horia Ioan Geanta Neag <[email protected]>
Just a thing I noticed because the time on this message is (at this
moment) in the future, putting this message a the top of its folder. Not
really a valid reason to have a look at a patch, but I did anyway.
> ---
> drivers/crypto/caam/caamalg.c | 27 +++++++++++++++++++++++++++
> drivers/crypto/caam/caamhash.c | 26 ++++++++++++++++++++++++++
> drivers/crypto/caam/caamrng.c | 26 ++++++++++++++++++++++++++
> 3 files changed, 79 insertions(+)
>
> diff --git a/drivers/crypto/caam/caamalg.c b/drivers/crypto/caam/caamalg.c
> index 87d9de4..d479dfb 100644
> --- a/drivers/crypto/caam/caamalg.c
> +++ b/drivers/crypto/caam/caamalg.c
> @@ -2441,8 +2441,35 @@ static struct caam_crypto_alg *caam_alg_alloc(struct
> caam_alg_template
>
> static int __init caam_algapi_init(void)
> {
> + struct device_node *dev_node;
> + struct platform_device *pdev;
> + struct device *ctrldev;
> + void *priv;
> int i = 0, err = 0;
>
> + dev_node = of_find_compatible_node(NULL, NULL, "fsl,sec-v4.0");
> + if (!dev_node) {
> + dev_node = of_find_compatible_node(NULL, NULL, "fsl,sec4.0");
> + if (!dev_node)
> + return -ENODEV;
> + }
> +
> + pdev = of_find_device_by_node(dev_node);
> + if (!pdev)
Doesn't this leak a reference to dev_node here?
> + return -ENODEV;
> +
> + ctrldev = &pdev->dev;
> + 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(&alg_list);
>
> /* register crypto algorithms the device supports */
> diff --git a/drivers/crypto/caam/caamhash.c b/drivers/crypto/caam/caamhash.c
> index 2ab057b..5e172a2 100644
> --- a/drivers/crypto/caam/caamhash.c
> +++ b/drivers/crypto/caam/caamhash.c
> @@ -1793,8 +1793,34 @@ caam_hash_alloc(struct caam_hash_template *template,
>
> static int __init caam_algapi_hash_init(void)
> {
> + struct device_node *dev_node;
> + struct platform_device *pdev;
> + struct device *ctrldev;
> + void *priv;
> int i = 0, err = 0;
>
> + dev_node = of_find_compatible_node(NULL, NULL, "fsl,sec-v4.0");
> + if (!dev_node) {
> + dev_node = of_find_compatible_node(NULL, NULL, "fsl,sec4.0");
> + if (!dev_node)
> + return -ENODEV;
> + }
> +
> + pdev = of_find_device_by_node(dev_node);
> + if (!pdev)
Ditto.
> + return -ENODEV;
> +
> + ctrldev = &pdev->dev;
> + 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(&hash_list);
>
> /* register crypto algorithms the device supports */
> diff --git a/drivers/crypto/caam/caamrng.c b/drivers/crypto/caam/caamrng.c
> index 8c07d31..c4c36c4 100644
> --- a/drivers/crypto/caam/caamrng.c
> +++ b/drivers/crypto/caam/caamrng.c
> @@ -278,6 +278,32 @@ static void __exit caam_rng_exit(void)
> static int __init caam_rng_init(void)
> {
> struct device *dev;
> + struct device_node *dev_node;
> + struct platform_device *pdev;
> + struct device *ctrldev;
> + void *priv;
> +
> + dev_node = of_find_compatible_node(NULL, NULL, "fsl,sec-v4.0");
> + if (!dev_node) {
> + dev_node = of_find_compatible_node(NULL, NULL, "fsl,sec4.0");
> + if (!dev_node)
> + return -ENODEV;
> + }
> +
> + pdev = of_find_device_by_node(dev_node);
> + if (!pdev)
Ditto.
> + return -ENODEV;
> +
> + ctrldev = &pdev->dev;
> + 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;
>
> dev = caam_jr_alloc();
> if (IS_ERR(dev)) {
Paul Bolle
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
