Commit ce6b222b authored by Krzysztof Kozlowski's avatar Krzysztof Kozlowski Committed by liwei
Browse files

usb: dwc3: st: fix probed platform device ref count on probe error path 

mainline inclusion
from mainline-v6.11-rc6
commit ddfcfeba891064b88bb844208b43bef2ef970f0c
category: bugfix
bugzilla: https://gitee.com/src-openeuler/kernel/issues/IAR624
CVE: CVE-2024-46674

Reference: https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?id=ddfcfeba891064b88bb844208b43bef2ef970f0c



--------------------------------

The probe function never performs any paltform device allocation, thus
error path "undo_platform_dev_alloc" is entirely bogus.  It drops the
reference count from the platform device being probed.  If error path is
triggered, this will lead to unbalanced device reference counts and
premature release of device resources, thus possible use-after-free when
releasing remaining devm-managed resources.

Fixes: f83fca07 ("usb: dwc3: add ST dwc3 glue layer to manage dwc3 HC")
Cc: stable@vger.kernel.org
Signed-off-by: default avatarKrzysztof Kozlowski <krzysztof.kozlowski@linaro.org>
Acked-by: default avatarThinh Nguyen <Thinh.Nguyen@synopsys.com>
Reviewed-by: default avatarPatrice Chotard <patrice.chotard@foss.st.com>
Link: https://lore.kernel.org/r/20240814093957.37940-1-krzysztof.kozlowski@linaro.org


Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: default avatarliwei <liwei728@huawei.com>
parent 6966f4d4

drivers/usb/dwc3/dwc3-st.c

+3 −8
Original line number Diff line number Diff line
@@ -219,10 +219,8 @@ static int st_dwc3_probe(struct platform_device *pdev) 
	dwc3_data->regmap = regmap;



	res = platform_get_resource_byname(pdev, IORESOURCE_MEM, "syscfg-reg");

	if (!res) {

		ret = -ENXIO;

		goto undo_platform_dev_alloc;

	}

	if (!res)

		return -ENXIO;



	dwc3_data->syscfg_reg_off = res->start;
@@ -233,8 +231,7 @@ static int st_dwc3_probe(struct platform_device *pdev) 
		devm_reset_control_get_exclusive(dev, "powerdown");

	if (IS_ERR(dwc3_data->rstc_pwrdn)) {

		dev_err(&pdev->dev, "could not get power controller\n");

		ret = PTR_ERR(dwc3_data->rstc_pwrdn);

		goto undo_platform_dev_alloc;

		return PTR_ERR(dwc3_data->rstc_pwrdn);

	}



	/* Manage PowerDown */
@@ -300,8 +297,6 @@ static int st_dwc3_probe(struct platform_device *pdev) 
	reset_control_assert(dwc3_data->rstc_rst);

undo_powerdown:

	reset_control_assert(dwc3_data->rstc_pwrdn);

undo_platform_dev_alloc:

	platform_device_put(pdev);

	return ret;

}