lkml.org 
[lkml]   [2019]   [Feb]   [11]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 4.20 088/352] soc: bcm: brcmstb: Dont leak device tree node reference
    Date
    4.20-stable review patch.  If anyone has any objections, please let me know.

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

    [ Upstream commit 1861a7f07e02292830a1ca256328d370deefea30 ]

    of_find_node_by_path() acquires a reference to the node returned by it
    and that reference needs to be dropped by its caller. soc_is_brcmstb()
    doesn't do that, so fix it.

    [treding: slightly rewrite to avoid inline comparison]

    Fixes: d52fad262041 ("soc: add stubs for brcmstb SoC's")
    Signed-off-by: Yangtao Li <tiny.windzz@gmail.com>
    Signed-off-by: Florian Fainelli <f.fainelli@gmail.com>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    drivers/soc/bcm/brcmstb/common.c | 6 +++++-
    1 file changed, 5 insertions(+), 1 deletion(-)

    diff --git a/drivers/soc/bcm/brcmstb/common.c b/drivers/soc/bcm/brcmstb/common.c
    index 14185451901d..bf9123f727e8 100644
    --- a/drivers/soc/bcm/brcmstb/common.c
    +++ b/drivers/soc/bcm/brcmstb/common.c
    @@ -31,13 +31,17 @@ static const struct of_device_id brcmstb_machine_match[] = {

    bool soc_is_brcmstb(void)
    {
    + const struct of_device_id *match;
    struct device_node *root;

    root = of_find_node_by_path("/");
    if (!root)
    return false;

    - return of_match_node(brcmstb_machine_match, root) != NULL;
    + match = of_match_node(brcmstb_machine_match, root);
    + of_node_put(root);
    +
    + return match != NULL;
    }

    u32 brcmstb_get_family_id(void)
    --
    2.19.1


    \
     
     \ /
      Last update: 2019-02-11 15:25    [W:4.042 / U:0.260 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site