* [PATCH v2] soc: bcm: brcmstb: Don't leak device tree node reference
@ 2018-11-24 14:52 Yangtao Li
2018-11-26 14:42 ` Frank Lee
2018-11-28 21:47 ` Florian Fainelli
0 siblings, 2 replies; 4+ messages in thread
From: Yangtao Li @ 2018-11-24 14:52 UTC (permalink / raw)
To: computersforpeace, gregory.0xf0, f.fainelli,
bcm-kernel-feedback-list, treding, olof, arnd
Cc: linux-arm-kernel, linux-kernel, Yangtao Li
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@gmail.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
^ permalink raw reply related [flat|nested] 4+ messages in thread
* Re: [PATCH v2] soc: bcm: brcmstb: Don't leak device tree node reference
2018-11-24 14:52 [PATCH v2] soc: bcm: brcmstb: Don't leak device tree node reference Yangtao Li
@ 2018-11-26 14:42 ` Frank Lee
2018-11-28 0:25 ` Florian Fainelli
2018-11-28 21:47 ` Florian Fainelli
1 sibling, 1 reply; 4+ messages in thread
From: Frank Lee @ 2018-11-26 14:42 UTC (permalink / raw)
To: Brian Norris, Gregory Fong, Florian Fainelli,
bcm-kernel-feedback-list, treding, olof, Arnd Bergmann
Cc: linux-arm-kernel, linux-kernel
On Sat, Nov 24, 2018 at 10:52 PM Yangtao Li <tiny.windzz@gmail.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@gmail.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
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH v2] soc: bcm: brcmstb: Don't leak device tree node reference
2018-11-26 14:42 ` Frank Lee
@ 2018-11-28 0:25 ` Florian Fainelli
0 siblings, 0 replies; 4+ messages in thread
From: Florian Fainelli @ 2018-11-28 0:25 UTC (permalink / raw)
To: Frank Lee, Brian Norris, Gregory Fong, Florian Fainelli,
bcm-kernel-feedback-list, treding, olof, Arnd Bergmann
Cc: linux-arm-kernel, linux-kernel
On 11/26/18 6:42 AM, Frank Lee wrote:
> On Sat, Nov 24, 2018 at 10:52 PM Yangtao Li <tiny.windzz@gmail.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@gmail.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 ?
This looks better, I will add:
Fixes: d52fad262041 ("soc: add stubs for brcmstb SoC's")
while applying the patch.
--
Florian
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH v2] soc: bcm: brcmstb: Don't leak device tree node reference
2018-11-24 14:52 [PATCH v2] soc: bcm: brcmstb: Don't leak device tree node reference Yangtao Li
2018-11-26 14:42 ` Frank Lee
@ 2018-11-28 21:47 ` Florian Fainelli
1 sibling, 0 replies; 4+ messages in thread
From: Florian Fainelli @ 2018-11-28 21:47 UTC (permalink / raw)
To: Yangtao Li, computersforpeace, gregory.0xf0, f.fainelli,
bcm-kernel-feedback-list, treding, olof, arnd
Cc: linux-arm-kernel, linux-kernel
On 11/24/18 6:52 AM, Yangtao Li 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@gmail.com>
Applied to drivers/next, thanks!
--
Florian
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2018-11-28 21:47 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2018-11-24 14:52 [PATCH v2] soc: bcm: brcmstb: Don't leak device tree node reference Yangtao Li
2018-11-26 14:42 ` Frank Lee
2018-11-28 0:25 ` Florian Fainelli
2018-11-28 21:47 ` Florian Fainelli
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).