]> git.proxmox.com Git - mirror_ubuntu-bionic-kernel.git/commitdiff
crypto: crypto4xx - add missing of_node_put after of_device_is_available
authorJulia Lawall <Julia.Lawall@lip6.fr>
Sat, 23 Feb 2019 13:20:39 +0000 (14:20 +0100)
committerKleber Sacilotto de Souza <kleber.souza@canonical.com>
Wed, 14 Aug 2019 09:18:49 +0000 (11:18 +0200)
BugLink: https://bugs.launchpad.net/bugs/1838116
[ Upstream commit 8c2b43d2d85b48a97d2f8279278a4aac5b45f925 ]

Add an of_node_put when a tested device node is not available.

The semantic patch that fixes this problem is as follows
(http://coccinelle.lip6.fr):

// <smpl>
@@
identifier f;
local idexpression e;
expression x;
@@

e = f(...);
... when != of_node_put(e)
    when != x = e
    when != e = x
    when any
if (<+...of_device_is_available(e)...+>) {
  ... when != of_node_put(e)
(
  return e;
|
+ of_node_put(e);
  return ...;
)
}
// </smpl>

Fixes: 5343e674f32fb ("crypto4xx: integrate ppc4xx-rng into crypto4xx")
Signed-off-by: Julia Lawall <Julia.Lawall@lip6.fr>
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
Signed-off-by: Sasha Levin <sashal@kernel.org>
Signed-off-by: Kamal Mostafa <kamal@canonical.com>
Signed-off-by: Khalid Elmously <khalid.elmously@canonical.com>
drivers/crypto/amcc/crypto4xx_trng.c

index 677ca17fd2238d16ffdc5a7fafb41c24a7e2b675..368c5599515e23839bcbb19a16b115f7d6a7aaa2 100644 (file)
@@ -80,8 +80,10 @@ void ppc4xx_trng_probe(struct crypto4xx_core_device *core_dev)
 
        /* Find the TRNG device node and map it */
        trng = of_find_matching_node(NULL, ppc4xx_trng_match);
-       if (!trng || !of_device_is_available(trng))
+       if (!trng || !of_device_is_available(trng)) {
+               of_node_put(trng);
                return;
+       }
 
        dev->trng_base = of_iomap(trng, 0);
        of_node_put(trng);