FAILED: patch "[PATCH] ata: libahci_platform: Fix device reference leak in" failed to apply to 6.1-stable tree
Subsystems (3)
[email protected]
maintainerThe patch below does not apply to the 6.1-stable tree.
If someone wants it applied there, or to any other stable or longterm tree, then please email the backport, including the original git commit id to <[email protected]>.
To reproduce the conflict and resubmit, you may use the following commands:
git fetch https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/ linux-6.1.y
git checkout FETCH_HEAD
git cherry-pick -x 0d1cb83337f13af082afb68b28d3fdfe29cde7fb
# <resolve conflicts, build, test, etc.>
git commit -s
git send-email --to '<[email protected]>' --in-reply-to '2026092255-disaster-skittle-8855@gregkh' --subject-prefix 'PATCH 6.1.y' 'HEAD^..'
Possible dependencies:
thanks,
greg k-h
------------------ original commit in Linus's tree ------------------
From 0d1cb83337f13af082afb68b28d3fdfe29cde7fb Mon Sep 17 00:00:00 2001
From: Wentao Liang <[email protected]>
Date: Tue, 15 Sep 2026 06:59:33 +0000
Subject: [PATCH] ata: libahci_platform: Fix device reference leak in
ahci_platform_get_resources()
of_find_device_by_node() takes a reference on the port platform device, which is only used to look up its port regulator and is never released, neither on success nor on the error paths. Drop the reference with put_device() once the regulator has been obtained, which covers both the success and error paths.
drivers/ata/libahci_platform.c +1 -1
@@ -620,10 +620,10 @@ struct ahci_host_priv *ahci_platform_get_resources(struct platform_device *pdev,of_platform_device_create (child,NULL ,NULL ); port_dev =of_find_device_by_node (child); -if (port_dev) { rc =ahci_platform_get_regulator (hpriv, port, &port_dev->dev); +put_device (&port_dev->dev);if (rc == -EPROBE_DEFER ) goto err_out; }
Sasha Levin
maintainerPATCH 1/2 ata: libahci_platform: Simplify code with for_each_child_of_node_scoped()
From: Zhang Zekun <[email protected]>
[ Upstream commit aa3ca1faf3222af7aaa194a910995820135fc54e ]
for_each_child_of_node_scoped() can put the device_node automatically. So let's use it to make the code simpler by avoiding the need to explicitly call of_node_put().
Stable-dep-of: 0d1cb83337f1 ("ata: libahci_platform: Fix device reference leak in ahci_platform_get_resources()")
--- drivers/ata/libahci_platform.c | 19 +++++-------------- 1 file changed, 5 insertions(+), 14 deletions(-)
drivers/ata/libahci_platform.c +5 -14
@@ -418,7 +418,6 @@ static int ahci_platform_get_regulator(struct ahci_host_priv *hpriv, u32 port,static int ahci_platform_get_firmware (struct ahci_host_priv *hpriv,struct device *dev) { -struct device_node *child;u32 port;if (!of_property_read_u32 (dev->of_node,"hba-cap" , &hpriv->saved_cap))
@@ -427,14 +426,12 @@ static int ahci_platform_get_firmware(struct ahci_host_priv *hpriv,of_property_read_u32 (dev->of_node,"ports-implemented" , &hpriv->saved_port_map); -for_each_child_of_node (dev->of_node, child) { +for_each_child_of_node_scoped (dev->of_node, child) {if (!of_device_is_available (child))continue ; -if (of_property_read_u32 (child,"reg" , &port)) { -of_node_put (child); +if (of_property_read_u32 (child,"reg" , &port))return -EINVAL ; - }if (!of_property_read_u32 (child,"hba-port-cap" , &hpriv->saved_port_cap[port])) hpriv->saved_port_cap[port] &=PORT_CMD_CAP ;
@@ -482,7 +479,6 @@ struct ahci_host_priv *ahci_platform_get_resources(struct platform_device *pdev,int child_nodes, rc = -ENOMEM , enabled_ports =0 ;struct device *dev = &pdev->dev;struct ahci_host_priv *hpriv; -struct device_node *child;u32 mask_port_map =0 ;u32 max_port;
@@ -604,7 +600,7 @@ struct ahci_host_priv *ahci_platform_get_resources(struct platform_device *pdev, }if (child_nodes) { -for_each_child_of_node (dev->of_node, child) { +for_each_child_of_node_scoped (dev->of_node, child) {u32 port;struct platform_device *port_dev__maybe_unused ;
@@ -613,7 +609,6 @@ struct ahci_host_priv *ahci_platform_get_resources(struct platform_device *pdev,if (of_property_read_u32 (child,"reg" , &port)) { rc = -EINVAL ; -of_node_put (child); goto err_out; }
@@ -631,18 +626,14 @@ struct ahci_host_priv *ahci_platform_get_resources(struct platform_device *pdev,if (port_dev) { rc =ahci_platform_get_regulator (hpriv, port, &port_dev->dev); -if (rc == -EPROBE_DEFER ) { -of_node_put (child); +if (rc == -EPROBE_DEFER ) goto err_out; - } }#endif rc =ahci_platform_get_phy (hpriv, port, dev, child); -if (rc) { -of_node_put (child); +if (rc) goto err_out; - } enabled_ports++; }
Signature · 1 line
2.53.0
Sasha Levin
maintainerPATCH 2/2 ata: libahci_platform: Fix device reference leak in ahci_platform_get_resources()
From: Wentao Liang <[email protected]>
[ Upstream commit 0d1cb83337f13af082afb68b28d3fdfe29cde7fb ]
of_find_device_by_node() takes a reference on the port platform device, which is only used to look up its port regulator and is never released, neither on success nor on the error paths. Drop the reference with put_device() once the regulator has been obtained, which covers both the success and error paths.
--- drivers/ata/libahci_platform.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/ata/libahci_platform.c +1 -1
@@ -622,10 +622,10 @@ struct ahci_host_priv *ahci_platform_get_resources(struct platform_device *pdev,of_platform_device_create (child,NULL ,NULL ); port_dev =of_find_device_by_node (child); -if (port_dev) { rc =ahci_platform_get_regulator (hpriv, port, &port_dev->dev); +put_device (&port_dev->dev);if (rc == -EPROBE_DEFER ) goto err_out; }
Signature · 1 line
2.53.0