ARM: hisi: handle of_iomap and fix missing of_node_put

[ Upstream commit d396cb185c0337aae5664b250cdd9a73f6eb1503 ]

Relying on an unchecked of_iomap() which can return NULL is problematic
here, an explicit check seems mandatory. Also the call to
of_find_compatible_node() returns a device node with refcount incremented
therefor an explicit of_node_put() is needed here.

Signed-off-by: Nicholas Mc Guire <hofrat@osadl.org>
Fixes: commit 22bae4290457 ("ARM: hi3xxx: add hotplug support")
Signed-off-by: Wei Xu <xuwei5@hisilicon.com>
Signed-off-by: Sasha Levin <alexander.levin@microsoft.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/arch/arm/mach-hisi/hotplug.c b/arch/arm/mach-hisi/hotplug.c
index a129aae..3f28c91 100644 (file)
--- a/arch/arm/mach-hisi/hotplug.c
+++ b/arch/arm/mach-hisi/hotplug.c
@@ -148,13 +148,20 @@ static int hi3xxx_hotplug_init(void)
        struct device_node *node;
 
        node = of_find_compatible_node(NULL, NULL, "hisilicon,sysctrl");
-       if (node) {
-               ctrl_base = of_iomap(node, 0);
-               id = HI3620_CTRL;
-               return 0;
+       if (!node) {
+               id = ERROR_CTRL;
+               return -ENOENT;
        }
-       id = ERROR_CTRL;
-       return -ENOENT;
+
+       ctrl_base = of_iomap(node, 0);
+       of_node_put(node);
+       if (!ctrl_base) {
+               id = ERROR_CTRL;
+               return -ENOMEM;
+       }
+
+       id = HI3620_CTRL;
+       return 0;
 }
 
 void hi3xxx_set_cpu(int cpu, bool enable)