Linux ARM-MSM sub-architecture
 help / color / mirror / Atom feed
From: Thinh Nguyen <Thinh.Nguyen@synopsys.com>
To: Miaoqian Lin <linmq006@gmail.com>
Cc: Andy Gross <agross@kernel.org>,
	Bjorn Andersson <andersson@kernel.org>,
	Konrad Dybcio <konrad.dybcio@somainline.org>,
	Thinh Nguyen <Thinh.Nguyen@synopsys.com>,
	Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
	Sandeep Maheswaram <sanm@codeaurora.org>,
	Matthias Kaehlcke <mka@chromium.org>,
	Chandana Kishori Chiluveru <cchiluve@codeaurora.org>,
	Felipe Balbi <balbi@kernel.org>,
	"linux-arm-msm@vger.kernel.org" <linux-arm-msm@vger.kernel.org>,
	"linux-usb@vger.kernel.org" <linux-usb@vger.kernel.org>,
	"linux-kernel@vger.kernel.org" <linux-kernel@vger.kernel.org>
Subject: Re: [PATCH] usb: dwc3: qcom: Fix memory leak in dwc3_qcom_interconnect_init
Date: Wed, 7 Dec 2022 02:30:25 +0000	[thread overview]
Message-ID: <20221207023022.ubukexlvhrfrw4dy@synopsys.com> (raw)
In-Reply-To: <20221206081731.818107-1-linmq006@gmail.com>

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

      reply	other threads:[~2022-12-07  2:31 UTC|newest]

Thread overview: 2+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
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 message]

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20221207023022.ubukexlvhrfrw4dy@synopsys.com \
    --to=thinh.nguyen@synopsys.com \
    --cc=agross@kernel.org \
    --cc=andersson@kernel.org \
    --cc=balbi@kernel.org \
    --cc=cchiluve@codeaurora.org \
    --cc=gregkh@linuxfoundation.org \
    --cc=konrad.dybcio@somainline.org \
    --cc=linmq006@gmail.com \
    --cc=linux-arm-msm@vger.kernel.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-usb@vger.kernel.org \
    --cc=mka@chromium.org \
    --cc=sanm@codeaurora.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox