lkml.org 
[lkml]   [2018]   [Sep]   [24]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 4.18 173/235] ARM: hisi: check of_iomap and fix missing of_node_put
    Date
    4.18-stable review patch.  If anyone has any objections, please let me know.

    ------------------

    From: Nicholas Mc Guire <hofrat@osadl.org>

    [ Upstream commit 81646a3d39ef14749301374a3a0b8311384cd412 ]

    of_find_compatible_node() returns a device node with refcount incremented
    and thus needs an explicit of_node_put(). Further relying on an unchecked
    of_iomap() which can return NULL is problematic here, after all ctrl_base
    is critical enough for hix5hd2_set_cpu() to call BUG() if not available
    so a check seems mandated here.

    Signed-off-by: Nicholas Mc Guire <hofrat@osadl.org>
    0002 Fixes: commit 06cc5c1d4d73 ("ARM: hisi: enable hix5hd2 SoC")
    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>
    ---
    arch/arm/mach-hisi/hotplug.c | 14 +++++++++-----
    1 file changed, 9 insertions(+), 5 deletions(-)

    --- a/arch/arm/mach-hisi/hotplug.c
    +++ b/arch/arm/mach-hisi/hotplug.c
    @@ -180,11 +180,15 @@ static bool hix5hd2_hotplug_init(void)
    struct device_node *np;

    np = of_find_compatible_node(NULL, NULL, "hisilicon,cpuctrl");
    - if (np) {
    - ctrl_base = of_iomap(np, 0);
    - return true;
    - }
    - return false;
    + if (!np)
    + return false;
    +
    + ctrl_base = of_iomap(np, 0);
    + of_node_put(np);
    + if (!ctrl_base)
    + return false;
    +
    + return true;
    }

    void hix5hd2_set_cpu(int cpu, bool enable)

    \
     
     \ /
      Last update: 2018-09-24 14:48    [W:4.297 / U:0.224 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site