From: Javier Carrasco <javier.carrasco.cruz@xxxxxxxxx>
commit 22a3703af127e897dc7df89372b85bb9dc331c5f upstream.
An error path was introduced without including the required call to
of_node_put() to decrement the node's refcount and avoid leaking memory.
If the call to kzalloc() for 'mgmt' fails, the probe returns without
decrementing the refcount.
Use the automatic cleanup facility to fix the bug and protect the code
against new error paths where the call to of_node_put() might be missing
again.
Cc: stable@xxxxxxxxxxxxxxx
Fixes: 1c9e16b73166 ("staging: vc04_services: vchiq_arm: Split driver static and runtime data")
Signed-off-by: Javier Carrasco <javier.carrasco.cruz@xxxxxxxxx>
Reviewed-by: Dan Carpenter <dan.carpenter@xxxxxxxxxx>
Reviewed-by: Umang Jain <umang.jain@xxxxxxxxxxxxxxxx>
Link: https://lore.kernel.org/r/20241014-vchiq_arm-of_node_put-v2-2-cafe0a4c2666@xxxxxxxxx
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx>
---
drivers/staging/vc04_services/interface/vchiq_arm/vchiq_arm.c | 6 ++----
1 file changed, 2 insertions(+), 4 deletions(-)
--- a/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_arm.c
+++ b/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_arm.c
@@ -1715,7 +1715,6 @@ MODULE_DEVICE_TABLE(of, vchiq_of_match);
static int vchiq_probe(struct platform_device *pdev)
{
- struct device_node *fw_node;
const struct vchiq_platform_info *info;
struct vchiq_drv_mgmt *mgmt;
int ret;
@@ -1724,8 +1723,8 @@ static int vchiq_probe(struct platform_d
if (!info)
return -EINVAL;
- fw_node = of_find_compatible_node(NULL, NULL,
- "raspberrypi,bcm2835-firmware");
+ struct device_node *fw_node __free(device_node) =
+ of_find_compatible_node(NULL, NULL, "raspberrypi,bcm2835-firmware");
if (!fw_node) {
dev_err(&pdev->dev, "Missing firmware node\n");
return -ENOENT;
@@ -1736,7 +1735,6 @@ static int vchiq_probe(struct platform_d
return -ENOMEM;
mgmt->fw = devm_rpi_firmware_get(&pdev->dev, fw_node);
- of_node_put(fw_node);
if (!mgmt->fw)
return -EPROBE_DEFER;
Patches currently in stable-queue which might be from javier.carrasco.cruz@xxxxxxxxx are
queue-6.12/leds-max5970-fix-unreleased-fwnode_handle-in-probe-f.patch
queue-6.12/wifi-brcmfmac-release-root-node-in-all-execution-paths.patch
queue-6.12/counter-stm32-timer-cnt-fix-device_node-handling-in-probe_encoder.patch
queue-6.12/staging-vchiq_arm-fix-missing-refcount-decrement-in-error-path-for-fw_node.patch
queue-6.12/bluetooth-btbcm-fix-missing-of_node_put-in-btbcm_get.patch
queue-6.12/platform-chrome-cros_ec_typec-fix-missing-fwnode-reference-decrement.patch
queue-6.12/clocksource-drivers-timer-ti-dm-fix-child-node-refco.patch
queue-6.12/mtd-ubi-fix-unreleased-fwnode_handle-in-find_volume_fwnode.patch
queue-6.12/soc-fsl-rcpm-fix-missing-of_node_put-in-copy_ippdexpcr1_setting.patch
