ARM: vexpress: fix two device_node refcount leaks
Subsystems (4)
cover ARM: vexpress: fix two device_node refcount leaks
The Versatile Express SMP bring-up path leaks two device_node references during boot:
- vexpress_flags_set() (mach-versatile/v2m.c) leaks the "arm,vexpress-sysreg" node obtained via of_find_compatible_node().
- vexpress_smp_dt_prepare_cpus() (mach-versatile/platsmp-vexpress.c) leaks the SCU node obtained via of_find_matching_node().
of_iomap() does not take ownership of the node, so each is a one-shot refcount leak with no functional impact. They were introduced by different commits, so they are split into one patch each.
The first leak was reported by static analysis (CodeQL); the second was found while reviewing that report. The CodeQL query was synthesized with LLM assistance, and the patches were drafted with LLM assistance; I have reviewed them.
Compile-tested only (ARCH=arm multi_v7_defconfig, W=1); I have no Versatile Express hardware.
Weigang He (2):
ARM: vexpress: fix device_node refcount leak in vexpress_flags_set()
ARM: vexpress: fix device_node refcount leak in
vexpress_smp_dt_prepare_cpus()
arch/arm/mach-versatile/platsmp-vexpress.c | 4 ++-- arch/arm/mach-versatile/v2m.c | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-)
base-commit: 165768bb70265b5c38cf0b73fafd75be235f8b14
Signature · 1 line
2.43.0
PATCH 1/2 ARM: vexpress: fix device_node refcount leak in vexpress_flags_set()
vexpress_flags_set() obtains a reference to the "arm,vexpress-sysreg" device node via of_find_compatible_node() and passes it to of_iomap(), but never calls of_node_put() on it. of_iomap() only reads the node's reg property to create the mapping and does not take ownership, so the node reference is leaked. The function runs from the __init SMP prepare path and caches the mapping in a static, so this is a one-shot leak of a single refcount during boot, with no functional impact.
The lookup was added to drivers/mfd/vexpress-sysreg.c by the commit below and later moved here by commit 9b06fc39084e ("ARM: vexpress: Move vexpress_flags_set() into arch code").
Annotate node with the __free(device_node) cleanup attribute so the reference is released when it goes out of scope.
Found by static analysis tool CodeQL.
---
Notes:
Compile-tested only (ARCH=arm multi_v7_defconfig, W=1). Not tested on hardware; I have no Versatile Express board.
The CodeQL query behind this report was synthesized with LLM assistance, and the fix and changelog were drafted with LLM assistance; I have reviewed them.
arch/arm/mach-versatile/v2m.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
arch/arm/mach-versatile/v2m.c +2 -2
@@ -13,8 +13,8 @@ void vexpress_flags_set(u32 data)static void __iomem *base;if (!base) { -struct device_node *node =of_find_compatible_node (NULL ,NULL , -"arm,vexpress-sysreg" ); + struct device_node *node __free(device_node) = +of_find_compatible_node (NULL ,NULL ,"arm,vexpress-sysreg" ); base =of_iomap (node,0 ); }
Signature · 1 line
2.43.0
Re: [PATCH 1/2] ARM: vexpress: fix device_node refcount leak in vexpress_flags_set()
Quoted 12 lines · Weigang He
vexpress_flags_set()obtains a reference to the "arm,vexpress-sysreg" device node viaof_find_compatible_node()and passes it toof_iomap(), but never callsof_node_put()on it.of_iomap()only reads the node's reg property to create the mapping and does not take ownership, so the node reference is leaked. The function runs from the__initSMP prepare path and caches the mapping in a static, so this is a one-shot leak of a single refcount during boot, with no functional impact.The lookup was added to
drivers/mfd/vexpress-sysreg.cby the commit below and later moved here by commit9b06fc39084e("ARM: vexpress: Movevexpress_flags_set()into arch code").
Quoted 8 lines
Annotate node with the
__free(device_node)cleanup attribute so the reference is released when it goes out of scope.Found by static analysis tool CodeQL.
Fixes 974cc7b93441 ("mfd: vexpress: Define the device as MFD cells")Assisted-by LLM codeqlSigned-off-by Weigang He <[email protected]>
Best regards,
Liviu
Quoted 31 lines
---
Notes:
Compile-tested only (ARCH=armmulti_v7_defconfig, W=1). Not tested on hardware; I have no Versatile Express board.The CodeQL query behind this report was synthesized with LLM assistance, and the fix and changelog were drafted with LLM assistance; I have reviewed them.
arch/arm/mach-versatile/v2m.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)arch/arm/mach-versatile/v2m.c +2
-2@@ -13,8 +13,8 @@ void vexpress_flags_set(u32 data)static void __iomem *base;if (!base) { -struct device_node *node =of_find_compatible_node (NULL ,NULL , -"arm,vexpress-sysreg" ); + struct device_node *node __free(device_node) = +of_find_compatible_node (NULL ,NULL ,"arm,vexpress-sysreg" ); base =of_iomap (node,0 ); }Signature · 1 line
2.43.0
Signature · 8 lines
====================
| I would like to |
| fix the world, |
| but they're not |
| giving me the |
\ source code! /
---------------
¯\_(ツ)_/¯PATCH 2/2 ARM: vexpress: fix device_node refcount leak in vexpress_smp_dt_prepare_cpus()
In reply to Weigang Hevexpress_smp_dt_prepare_cpus() obtains a reference to the SCU device node via of_find_matching_node() and passes it to of_iomap(), but never calls of_node_put() on it. of_iomap() does not take ownership of the node, so the reference is leaked. The function is the .smp_prepare_cpus hook invoked once from the __init SMP bring-up path, so this is a one-shot leak of a single refcount during boot, with no functional impact.
Annotate scu with the __free(device_node) cleanup attribute so the reference is released when the function returns.
Found while reviewing a CodeQL report for vexpress_flags_set() on the same SMP bring-up path.
---
Notes:
Compile-tested only (ARCH=arm multi_v7_defconfig, W=1). Not tested on hardware; I have no Versatile Express board.
The CodeQL query behind this report was synthesized with LLM assistance, and the fix and changelog were drafted with LLM assistance; I have reviewed them.
arch/arm/mach-versatile/platsmp-vexpress.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
arch/arm/mach-versatile/platsmp-vexpress.c +2 -2
@@ -61,8 +61,8 @@ static const struct of_device_id vexpress_smp_dt_scu_match[] __initconst = {static void __init vexpress_smp_dt_prepare_cpus (unsigned int max_cpus) { -struct device_node *scu =of_find_matching_node (NULL , - vexpress_smp_dt_scu_match); + struct device_node *scu __free(device_node) = +of_find_matching_node (NULL , vexpress_smp_dt_scu_match);if (scu)scu_enable (of_iomap (scu,0 ));
Signature · 1 line
2.43.0
Re: [PATCH 2/2] ARM: vexpress: fix device_node refcount leak in vexpress_smp_dt_prepare_cpus()
Quoted 11 lines · Weigang He
vexpress_smp_dt_prepare_cpus()obtains a reference to the SCU device node viaof_find_matching_node()and passes it toof_iomap(), but never callsof_node_put()on it.of_iomap()does not take ownership of the node, so the reference is leaked. The function is the .smp_prepare_cpus hook invoked once from the__initSMP bring-up path, so this is a one-shot leak of a single refcount during boot, with no functional impact.Annotate scu with the
__free(device_node)cleanup attribute so the reference is released when the function returns.
Quoted 6 lines
Found while reviewing a CodeQL report for
vexpress_flags_set()on the same SMP bring-up path.Fixes d2606f81d563 ("ARM: vexpress: Simplify SMP operations for DT-powered system")Assisted-by LLM codeqlSigned-off-by Weigang He <[email protected]>
Best regards,
Liviu
Quoted 31 lines
---
Notes:
Compile-tested only (ARCH=armmulti_v7_defconfig, W=1). Not tested on hardware; I have no Versatile Express board.The CodeQL query behind this report was synthesized with LLM assistance, and the fix and changelog were drafted with LLM assistance; I have reviewed them.
arch/arm/mach-versatile/platsmp-vexpress.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)arch/arm/mach-versatile/platsmp-vexpress.c +2
-2@@ -61,8 +61,8 @@ static const struct of_device_id vexpress_smp_dt_scu_match[] __initconst = {static void __init vexpress_smp_dt_prepare_cpus (unsigned int max_cpus) { -struct device_node *scu =of_find_matching_node (NULL , - vexpress_smp_dt_scu_match); + struct device_node *scu __free(device_node) = +of_find_matching_node (NULL , vexpress_smp_dt_scu_match);if (scu)scu_enable (of_iomap (scu,0 ));Signature · 1 line
2.43.0
Signature · 8 lines
====================
| I would like to |
| fix the world, |
| but they're not |
| giving me the |
\ source code! /
---------------
¯\_(ツ)_/¯Quoted 9 lines · Weigang He
The Versatile Express SMP bring-up path leaks two
device_nodereferences during boot:-
vexpress_flags_set()(mach-versatile/v2m.c) leaks the "arm,vexpress-sysreg" node obtained viaof_find_compatible_node().
-vexpress_smp_dt_prepare_cpus()(mach-versatile/platsmp-vexpress.c) leaks the SCU node obtained viaof_find_matching_node().[...]
Applied to sudeep.holla/linux (for-next/vexpress/fixes), thanks!
[1/2] ARM: vexpress: fix device_node refcount leak in vexpress_flags_set()
https://git.kernel.org/sudeep.holla/c/62b9ae8ae4a7 [2/2] ARM: vexpress: fix device_node refcount leak in vexpress_smp_dt_prepare_cpus() https://git.kernel.org/sudeep.holla/c/27b98d331f1d
Signature · 2 lines
Regards, Sudeep