Commit 5692aeea authored by Lu Hongfei's avatar Lu Hongfei Committed by Bjorn Andersson
Browse files

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



The device_for_each_child_node loop should call fwnode_handle_put()
before return in the error cases, to avoid resource leaks.

Let's fix this bug in pmic_glink_altmode_probe().

Signed-off-by: default avatarLu Hongfei <luhongfei@vivo.com>
Link: https://lore.kernel.org/r/20230612133452.47315-1-luhongfei@vivo.com


[bjorn: Rebased patch, moved fw_handle_put() from jump target into the loop]
Signed-off-by: default avatarBjorn Andersson <andersson@kernel.org>
parent d74612b6

drivers/soc/qcom/pmic_glink_altmode.c

+23 −7
Original line number Diff line number Diff line
@@ -444,6 +444,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);

			fwnode_handle_put(fwnode);

			return ret;

		}
@@ -454,6 +455,7 @@ 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);

			fwnode_handle_put(fwnode);

			return -EINVAL;

		}
@@ -468,46 +470,60 @@ static int pmic_glink_altmode_probe(struct auxiliary_device *adev, 
		alt_port->bridge.type = DRM_MODE_CONNECTOR_USB;



		ret = devm_drm_bridge_add(dev, &alt_port->bridge);

		if (ret)

		if (ret) {

			fwnode_handle_put(fwnode);

			return ret;

		}



		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))

		if (IS_ERR(alt_port->typec_mux)) {

			fwnode_handle_put(fwnode);

			return dev_err_probe(dev, PTR_ERR(alt_port->typec_mux),

					     "failed to acquire mode-switch for port: %d\n",

					     port);

		}



		ret = devm_add_action_or_reset(dev, pmic_glink_altmode_put_mux,

					       alt_port->typec_mux);

		if (ret)

		if (ret) {

			fwnode_handle_put(fwnode);

			return ret;

		}



		alt_port->typec_retimer = fwnode_typec_retimer_get(fwnode);

		if (IS_ERR(alt_port->typec_retimer))

		if (IS_ERR(alt_port->typec_retimer)) {

			fwnode_handle_put(fwnode);

			return dev_err_probe(dev, PTR_ERR(alt_port->typec_retimer),

					     "failed to acquire retimer-switch for port: %d\n",

					     port);

		}



		ret = devm_add_action_or_reset(dev, pmic_glink_altmode_put_retimer,

					       alt_port->typec_retimer);

		if (ret)

		if (ret) {

			fwnode_handle_put(fwnode);

			return ret;

		}



		alt_port->typec_switch = fwnode_typec_switch_get(fwnode);

		if (IS_ERR(alt_port->typec_switch))

		if (IS_ERR(alt_port->typec_switch)) {

			fwnode_handle_put(fwnode);

			return dev_err_probe(dev, PTR_ERR(alt_port->typec_switch),

					     "failed to acquire orientation-switch for port: %d\n",

					     port);

		}



		ret = devm_add_action_or_reset(dev, pmic_glink_altmode_put_switch,

					       alt_port->typec_switch);

		if (ret)

		if (ret) {

			fwnode_handle_put(fwnode);

			return ret;

		}

	}



	altmode->client = devm_pmic_glink_register_client(dev,

							  altmode->owner_id,