Re: [PATCH v2 2/2] usb: typec: qcom-pmic-typec: fix missing fwnode removal in error path
From: Heikki Krogerus
Date: Mon Oct 21 2024 - 09:02:30 EST
On Sun, Oct 20, 2024 at 02:56:35PM +0200, Javier Carrasco wrote:
> If drm_dp_hpd_bridge_register() fails, the probe function returns
> without removing the fwnode via fwnode_handle_put(), leaking the
> resource.
>
> Jump to fwnode_remove if drm_dp_hpd_bridge_register() fails to remove
> the fwnode acquired with device_get_named_child_node().
>
> Cc: stable@xxxxxxxxxxxxxxx
> Fixes: 7d9f1b72b296 ("usb: typec: qcom-pmic-typec: switch to DRM_AUX_HPD_BRIDGE")
> Signed-off-by: Javier Carrasco <javier.carrasco.cruz@xxxxxxxxx>
Reviewed-by: Heikki Krogerus <heikki.krogerus@xxxxxxxxxxxxxxx>
> ---
> drivers/usb/typec/tcpm/qcom/qcom_pmic_typec.c | 6 ++++--
> 1 file changed, 4 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/usb/typec/tcpm/qcom/qcom_pmic_typec.c b/drivers/usb/typec/tcpm/qcom/qcom_pmic_typec.c
> index 73a159e67ec2..3766790c1548 100644
> --- a/drivers/usb/typec/tcpm/qcom/qcom_pmic_typec.c
> +++ b/drivers/usb/typec/tcpm/qcom/qcom_pmic_typec.c
> @@ -93,8 +93,10 @@ static int qcom_pmic_typec_probe(struct platform_device *pdev)
> return -EINVAL;
>
> bridge_dev = devm_drm_dp_hpd_bridge_alloc(tcpm->dev, to_of_node(tcpm->tcpc.fwnode));
> - if (IS_ERR(bridge_dev))
> - return PTR_ERR(bridge_dev);
> + if (IS_ERR(bridge_dev)) {
> + ret = PTR_ERR(bridge_dev);
> + goto fwnode_remove;
> + }
>
> tcpm->tcpm_port = tcpm_register_port(tcpm->dev, &tcpm->tcpc);
> if (IS_ERR(tcpm->tcpm_port)) {
>
> --
> 2.43.0
--
heikki