diff mbox series

[v3] soc: qcom: pmic: Fix resource leaks in a device_for_each_child_node() loop

Message ID 20230612133452.47315-1-luhongfei@vivo.com (mailing list archive)
State Accepted
Commit 5692aeea5bcb9331e956628c3bc8fc9afcc9765d
Headers show
Series [v3] soc: qcom: pmic: Fix resource leaks in a device_for_each_child_node() loop | expand

Commit Message

Lu Hongfei June 12, 2023, 1:34 p.m. UTC 
The device_for_each_child_node loop should call fwnode_handle_put()
before return in some error cases, which could avoid resource leaks.

Let's fix this bug in pmic_glink_altmode_probe.

Signed-off-by: Lu Hongfei <luhongfei@vivo.com>
---
The modifications made compared to the previous version are as follows:
1. Modified the patch title
2. Modified the commit message to make it easier to understand
   patch's modifications.

 drivers/soc/qcom/pmic_glink_altmode.c | 27 ++++++++++++++++++---------
 1 file changed, 18 insertions(+), 9 deletions(-)

Comments

Bjorn Andersson Sept. 19, 2023, 11:07 p.m. UTC | #1 
On Mon, 12 Jun 2023 21:34:52 +0800, Lu Hongfei wrote:
> The device_for_each_child_node loop should call fwnode_handle_put()
> before return in some error cases, which could avoid resource leaks.
> 
> Let's fix this bug in pmic_glink_altmode_probe.
> 
> 

Applied, thanks!

[1/1] soc: qcom: pmic: Fix resource leaks in a device_for_each_child_node() loop
      commit: 5692aeea5bcb9331e956628c3bc8fc9afcc9765d

Best regards,
David Heidelberg Dec. 3, 2023, 5:46 p.m. UTC | #2 
Heya!

I think this would be great candidate for backport, at least up to 6.6. 
What do you think?

David
Dmitry Baryshkov Dec. 3, 2023, 6:12 p.m. UTC | #3 
On Sun, 3 Dec 2023 at 19:46, David Heidelberg <david@ixit.cz> wrote:
>
> Heya!
>
> I think this would be great candidate for backport, at least up to 6.6.
> What do you think?

Yes. Most likely it should have had:

Fixes: 080b4e24852b ("soc: qcom: pmic_glink: Introduce altmode support")
diff mbox series

Patch

diff --git a/drivers/soc/qcom/pmic_glink_altmode.c b/drivers/soc/qcom/pmic_glink_altmode.c
index df48fbea4b68..a7fc6570fa1e 100644
--- a/drivers/soc/qcom/pmic_glink_altmode.c
+++ b/drivers/soc/qcom/pmic_glink_altmode.c
@@ -395,7 +395,7 @@  static int pmic_glink_altmode_probe(struct auxiliary_device *adev,
 		ret = fwnode_property_read_u32(fwnode, "reg", &port);
 		if (ret < 0) {
 			dev_err(dev, "missing reg property of %pOFn\n", fwnode);
-			return ret;
+			goto err_node_put;
 		}
 
 		if (port >= ARRAY_SIZE(altmode->ports)) {
@@ -405,7 +405,8 @@  static int pmic_glink_altmode_probe(struct auxiliary_device *adev,
 
 		if (altmode->ports[port].altmode) {
 			dev_err(dev, "multiple connector definition for port %u\n", port);
-			return -EINVAL;
+			ret = -EINVAL;
+			goto err_node_put;
 		}
 
 		alt_port = &altmode->ports[port];
@@ -420,33 +421,37 @@  static int pmic_glink_altmode_probe(struct auxiliary_device *adev,
 
 		ret = devm_drm_bridge_add(dev, &alt_port->bridge);
 		if (ret)
-			return ret;
+			goto err_node_put;
 
 		alt_port->dp_alt.svid = USB_TYPEC_DP_SID;
 		alt_port->dp_alt.mode = USB_TYPEC_DP_MODE;
 		alt_port->dp_alt.active = 1;
 
 		alt_port->typec_mux = fwnode_typec_mux_get(fwnode);
-		if (IS_ERR(alt_port->typec_mux))
-			return dev_err_probe(dev, PTR_ERR(alt_port->typec_mux),
+		if (IS_ERR(alt_port->typec_mux)) {
+			ret = dev_err_probe(dev, PTR_ERR(alt_port->typec_mux),
 					     "failed to acquire mode-switch for port: %d\n",
 					     port);
+			goto err_node_put;
+		}
 
 		ret = devm_add_action_or_reset(dev, pmic_glink_altmode_put_mux,
 					       alt_port->typec_mux);
 		if (ret)
-			return ret;
+			goto err_node_put;
 
 		alt_port->typec_switch = fwnode_typec_switch_get(fwnode);
-		if (IS_ERR(alt_port->typec_switch))
-			return dev_err_probe(dev, PTR_ERR(alt_port->typec_switch),
+		if (IS_ERR(alt_port->typec_switch)) {
+			ret = dev_err_probe(dev, PTR_ERR(alt_port->typec_switch),
 					     "failed to acquire orientation-switch for port: %d\n",
 					     port);
+			goto err_node_put;
+		}
 
 		ret = devm_add_action_or_reset(dev, pmic_glink_altmode_put_switch,
 					       alt_port->typec_switch);
 		if (ret)
-			return ret;
+			goto err_node_put;
 	}
 
 	altmode->client = devm_pmic_glink_register_client(dev,
@@ -455,6 +460,10 @@  static int pmic_glink_altmode_probe(struct auxiliary_device *adev,
 							  pmic_glink_altmode_pdr_notify,
 							  altmode);
 	return PTR_ERR_OR_ZERO(altmode->client);
+
+err_node_put:
+	fwnode_handle_put(fwnode);
+	return ret;
 }
 
 static const struct auxiliary_device_id pmic_glink_altmode_id_table[] = {