lkml.org 
[lkml]   [2019]   [Jan]   [28]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH AUTOSEL 3.18 15/61] soc/tegra: Don't leak device tree node reference
    Date
    From: Yangtao Li <tiny.windzz@gmail.com>

    [ Upstream commit 9eb40fa2cd2d1f6829e7b49bb22692f754b9cfe0 ]

    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_tegra()
    doesn't do that, so fix it.

    Signed-off-by: Yangtao Li <tiny.windzz@gmail.com>
    Acked-by: Jon Hunter <jonathanh@nvidia.com>
    [treding: slightly rewrite to avoid inline comparison]
    Signed-off-by: Thierry Reding <treding@nvidia.com>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    drivers/soc/tegra/common.c | 6 +++++-
    1 file changed, 5 insertions(+), 1 deletion(-)

    diff --git a/drivers/soc/tegra/common.c b/drivers/soc/tegra/common.c
    index a71cb74f3674..04323ade15dd 100644
    --- a/drivers/soc/tegra/common.c
    +++ b/drivers/soc/tegra/common.c
    @@ -20,11 +20,15 @@ static const struct of_device_id tegra_machine_match[] = {

    bool soc_is_tegra(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(tegra_machine_match, root) != NULL;
    + match = of_match_node(tegra_machine_match, root);
    + of_node_put(root);
    +
    + return match != NULL;
    }
    --
    2.19.1
    \
     
     \ /
      Last update: 2019-01-28 17:27    [W:4.708 / U:0.168 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site