linux-kernel - Re: [PATCH v2] soc: bcm: brcmstb: Don't leak device tree node reference

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]

Message-ID: <CAEExFWut2Vu0e+j1U8_1PS683DtMMi7FVD6X=LfwwE63DT7Syg@mail.gmail.com>
Date:   Mon, 26 Nov 2018 22:42:37 +0800
From:   Frank Lee <tiny.windzz@...il.com>
To:     Brian Norris <computersforpeace@...il.com>,
        Gregory Fong <gregory.0xf0@...il.com>,
        Florian Fainelli <f.fainelli@...il.com>,
        bcm-kernel-feedback-list@...adcom.com, treding@...dia.com,
        olof@...om.net, Arnd Bergmann <arnd@...db.de>
Cc:     linux-arm-kernel@...ts.infradead.org, linux-kernel@...r.kernel.org
Subject: Re: [PATCH v2] soc: bcm: brcmstb: Don't leak device tree node reference

On Sat, Nov 24, 2018 at 10:52 PM Yangtao Li <tiny.windzz@...il.com> wrote:
>
> 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]
>
> Signed-off-by: Yangtao Li <tiny.windzz@...il.com>
> ---
> Changes in v2:
> -update changelog
> -slightly rewrite to avoid inline comparison
> ---
>  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.17.0
>
Hi Florian:

How about this ?

MBR,
Yangtao