[v1] soc: qcom: pmic: Fix resource leaks in device_for_each_child_node() loops

[PATCH] soc: qcom: pmic: Fix resource leaks in device_for_each_child_node() loops

Posted by Lu Hongfei 2 years, 8 months ago

The device_for_each_child_node loop in pmic_glink_altmode_probe should have
fwnode_handle_put() before return which could avoid resource leaks.
This patch could fix this bug.

Signed-off-by: Lu Hongfei <luhongfei@vivo.com>
---
 drivers/soc/qcom/pmic_glink_altmode.c | 27 ++++++++++++++++++---------
 1 file changed, 18 insertions(+), 9 deletions(-)

diff --git a/drivers/soc/qcom/pmic_glink_altmode.c b/drivers/soc/qcom/pmic_glink_altmode.c
index df48fbea4b68..a7fc6570fa1e
--- 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[] = {
-- 
2.39.0

Re: [PATCH] soc: qcom: pmic: Fix resource leaks in device_for_each_child_node() loops

Posted by Mukesh Ojha 2 years, 8 months ago


On 5/31/2023 1:25 PM, Lu Hongfei wrote:
> The device_for_each_child_node loop in pmic_glink_altmode_probe should have
> fwnode_handle_put() before return which could avoid resource leaks.
> This patch could fix this bug.
> 
> Signed-off-by: Lu Hongfei <luhongfei@vivo.com>

Use  Fixes: tag

Otherwise LGTM.

Reviewed-by: Mukesh Ojha <quic_mojha@quicinc.com>

-- Mukesh

> ---
>   drivers/soc/qcom/pmic_glink_altmode.c | 27 ++++++++++++++++++---------
>   1 file changed, 18 insertions(+), 9 deletions(-)
> 
> diff --git a/drivers/soc/qcom/pmic_glink_altmode.c b/drivers/soc/qcom/pmic_glink_altmode.c
> index df48fbea4b68..a7fc6570fa1e
> --- 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[] = {