usb: dwc3: qcom: Fix memory leak in dwc3_qcom_interconnect_init
authorMiaoqian Lin <linmq006@gmail.com>
Tue, 6 Dec 2022 08:17:31 +0000 (12:17 +0400)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Sat, 31 Dec 2022 12:33:10 +0000 (13:33 +0100)
commit 97a48da1619ba6bd42a0e5da0a03aa490a9496b1 upstream.

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")
Cc: stable <stable@kernel.org>
Acked-by: Thinh Nguyen <Thinh.Nguyen@synopsys.com>
Signed-off-by: Miaoqian Lin <linmq006@gmail.com>
Link: https://lore.kernel.org/r/20221206081731.818107-1-linmq006@gmail.com
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/usb/dwc3/dwc3-qcom.c

index 7c40f3f..b0a0351 100644 (file)
@@ -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;
 }
 
 /**