* [PATCH] usb: dwc3: qcom: Fix memory leak in dwc3_qcom_interconnect_init
@ 2022-12-06 8:17 Miaoqian Lin
2022-12-07 2:30 ` Thinh Nguyen
0 siblings, 1 reply; 2+ messages in thread
From: Miaoqian Lin @ 2022-12-06 8:17 UTC (permalink / raw)
To: Andy Gross, Bjorn Andersson, Konrad Dybcio, Thinh Nguyen,
Greg Kroah-Hartman, Sandeep Maheswaram, Matthias Kaehlcke,
Chandana Kishori Chiluveru, Felipe Balbi, linux-arm-msm,
linux-usb, linux-kernel
Cc: linmq006
of_icc_get() alloc resources for path handle, we should release it when not
need anymore. Like the release in dwc3_qcom_interconnect_exit() function.
Add icc_put() in error handling to fix this.
Fixes: bea46b981515 ("usb: dwc3: qcom: Add interconnect support in dwc3 driver")
Signed-off-by: Miaoqian Lin <linmq006@gmail.com>
---
drivers/usb/dwc3/dwc3-qcom.c | 13 ++++++++++---
1 file changed, 10 insertions(+), 3 deletions(-)
diff --git a/drivers/usb/dwc3/dwc3-qcom.c b/drivers/usb/dwc3/dwc3-qcom.c
index 7c40f3ffc054..b0a0351d2d8b 100644
--- a/drivers/usb/dwc3/dwc3-qcom.c
+++ b/drivers/usb/dwc3/dwc3-qcom.c
@@ -261,7 +261,8 @@ static int dwc3_qcom_interconnect_init(struct dwc3_qcom *qcom)
if (IS_ERR(qcom->icc_path_apps)) {
dev_err(dev, "failed to get apps-usb path: %ld\n",
PTR_ERR(qcom->icc_path_apps));
- return PTR_ERR(qcom->icc_path_apps);
+ ret = PTR_ERR(qcom->icc_path_apps);
+ goto put_path_ddr;
}
max_speed = usb_get_maximum_speed(&qcom->dwc3->dev);
@@ -274,16 +275,22 @@ static int dwc3_qcom_interconnect_init(struct dwc3_qcom *qcom)
}
if (ret) {
dev_err(dev, "failed to set bandwidth for usb-ddr path: %d\n", ret);
- return ret;
+ goto put_path_apps;
}
ret = icc_set_bw(qcom->icc_path_apps, APPS_USB_AVG_BW, APPS_USB_PEAK_BW);
if (ret) {
dev_err(dev, "failed to set bandwidth for apps-usb path: %d\n", ret);
- return ret;
+ goto put_path_apps;
}
return 0;
+
+put_path_apps:
+ icc_put(qcom->icc_path_apps);
+put_path_ddr:
+ icc_put(qcom->icc_path_ddr);
+ return ret;
}
/**
--
2.25.1
^ permalink raw reply related [flat|nested] 2+ messages in thread* Re: [PATCH] usb: dwc3: qcom: Fix memory leak in dwc3_qcom_interconnect_init
2022-12-06 8:17 [PATCH] usb: dwc3: qcom: Fix memory leak in dwc3_qcom_interconnect_init Miaoqian Lin
@ 2022-12-07 2:30 ` Thinh Nguyen
0 siblings, 0 replies; 2+ messages in thread
From: Thinh Nguyen @ 2022-12-07 2:30 UTC (permalink / raw)
To: Miaoqian Lin
Cc: Andy Gross, Bjorn Andersson, Konrad Dybcio, Thinh Nguyen,
Greg Kroah-Hartman, Sandeep Maheswaram, Matthias Kaehlcke,
Chandana Kishori Chiluveru, Felipe Balbi,
linux-arm-msm@vger.kernel.org, linux-usb@vger.kernel.org,
linux-kernel@vger.kernel.org
On Tue, Dec 06, 2022, Miaoqian Lin wrote:
> of_icc_get() alloc resources for path handle, we should release it when not
> need anymore. Like the release in dwc3_qcom_interconnect_exit() function.
> Add icc_put() in error handling to fix this.
>
> Fixes: bea46b981515 ("usb: dwc3: qcom: Add interconnect support in dwc3 driver")
> Signed-off-by: Miaoqian Lin <linmq006@gmail.com>
> ---
> drivers/usb/dwc3/dwc3-qcom.c | 13 ++++++++++---
> 1 file changed, 10 insertions(+), 3 deletions(-)
>
> diff --git a/drivers/usb/dwc3/dwc3-qcom.c b/drivers/usb/dwc3/dwc3-qcom.c
> index 7c40f3ffc054..b0a0351d2d8b 100644
> --- a/drivers/usb/dwc3/dwc3-qcom.c
> +++ b/drivers/usb/dwc3/dwc3-qcom.c
> @@ -261,7 +261,8 @@ static int dwc3_qcom_interconnect_init(struct dwc3_qcom *qcom)
> if (IS_ERR(qcom->icc_path_apps)) {
> dev_err(dev, "failed to get apps-usb path: %ld\n",
> PTR_ERR(qcom->icc_path_apps));
> - return PTR_ERR(qcom->icc_path_apps);
> + ret = PTR_ERR(qcom->icc_path_apps);
> + goto put_path_ddr;
> }
>
> max_speed = usb_get_maximum_speed(&qcom->dwc3->dev);
> @@ -274,16 +275,22 @@ static int dwc3_qcom_interconnect_init(struct dwc3_qcom *qcom)
> }
> if (ret) {
> dev_err(dev, "failed to set bandwidth for usb-ddr path: %d\n", ret);
> - return ret;
> + goto put_path_apps;
> }
>
> ret = icc_set_bw(qcom->icc_path_apps, APPS_USB_AVG_BW, APPS_USB_PEAK_BW);
> if (ret) {
> dev_err(dev, "failed to set bandwidth for apps-usb path: %d\n", ret);
> - return ret;
> + goto put_path_apps;
> }
>
> return 0;
> +
> +put_path_apps:
> + icc_put(qcom->icc_path_apps);
> +put_path_ddr:
> + icc_put(qcom->icc_path_ddr);
> + return ret;
> }
>
> /**
> --
> 2.25.1
>
Acked-by: Thinh Nguyen <Thinh.Nguyen@synopsys.com>
This should go on stable also.
Thanks,
Thinh
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2022-12-07 2:31 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2022-12-06 8:17 [PATCH] usb: dwc3: qcom: Fix memory leak in dwc3_qcom_interconnect_init Miaoqian Lin
2022-12-07 2:30 ` Thinh Nguyen
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox