Add the missing platform_device_put() before return from
dwc3_qcom_acpi_register_core in the error handling case.
Signed-off-by: Miaoqian Lin <[email protected]>
---
drivers/usb/dwc3/dwc3-qcom.c | 8 +++++++-
1 file changed, 7 insertions(+), 1 deletion(-)
diff --git a/drivers/usb/dwc3/dwc3-qcom.c b/drivers/usb/dwc3/dwc3-qcom.c
index 3cb01cdd02c2..5257783f17b0 100644
--- a/drivers/usb/dwc3/dwc3-qcom.c
+++ b/drivers/usb/dwc3/dwc3-qcom.c
@@ -598,8 +598,10 @@ static int dwc3_qcom_acpi_register_core(struct platform_device *pdev)
qcom->dwc3->dev.coherent_dma_mask = dev->coherent_dma_mask;
child_res = kcalloc(2, sizeof(*child_res), GFP_KERNEL);
- if (!child_res)
+ if (!child_res) {
+ platform_device_put(qcom->dwc3);
return -ENOMEM;
+ }
res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
if (!res) {
@@ -637,9 +639,13 @@ static int dwc3_qcom_acpi_register_core(struct platform_device *pdev)
if (ret) {
dev_err(&pdev->dev, "failed to add device\n");
device_remove_software_node(&qcom->dwc3->dev);
+ goto out;
}
+ kfree(child_res);
+ return 0;
out:
+ platform_device_put(qcom->dwc3);
kfree(child_res);
return ret;
}
--
2.17.1
On 12/31/21 1:36 PM, Miaoqian Lin wrote:
> Add the missing platform_device_put() before return from
> dwc3_qcom_acpi_register_core in the error handling case.
>
The discovered issue is valid.
Fixes: 2bc02355f8ba ("usb: dwc3: qcom: Add support for booting with ACPI")
> Signed-off-by: Miaoqian Lin <[email protected]>
> ---
> drivers/usb/dwc3/dwc3-qcom.c | 8 +++++++-
> 1 file changed, 7 insertions(+), 1 deletion(-)
>
> diff --git a/drivers/usb/dwc3/dwc3-qcom.c b/drivers/usb/dwc3/dwc3-qcom.c
> index 3cb01cdd02c2..5257783f17b0 100644
> --- a/drivers/usb/dwc3/dwc3-qcom.c
> +++ b/drivers/usb/dwc3/dwc3-qcom.c
> @@ -598,8 +598,10 @@ static int dwc3_qcom_acpi_register_core(struct platform_device *pdev)
> qcom->dwc3->dev.coherent_dma_mask = dev->coherent_dma_mask;
>
> child_res = kcalloc(2, sizeof(*child_res), GFP_KERNEL);
> - if (!child_res)
> + if (!child_res) {
> + platform_device_put(qcom->dwc3);
> return -ENOMEM;
Please do it in a unified way along all checks:
ret = -ENOMEM;
goto out;
kfree(NULL) is legit, please utilize it.
> + }
>
> res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
> if (!res) {
> @@ -637,9 +639,13 @@ static int dwc3_qcom_acpi_register_core(struct platform_device *pdev)
> if (ret) {
> dev_err(&pdev->dev, "failed to add device\n");
> device_remove_software_node(&qcom->dwc3->dev);
> + goto out;
> }
Please add a blank line here after the closing curly bracket.
> + kfree(child_res);
> + return 0;
>
> out:
> + platform_device_put(qcom->dwc3);
> kfree(child_res);
> return ret;
> }
>
Reviewed-by: Vladimir Zapolskiy <[email protected]>
--
Best wishes,
Vladimir
Fix the missing platform_device_put() before return from
dwc3_qcom_acpi_register_core in the error handling case.
Fixes: 2bc02355f8ba ("usb: dwc3: qcom: Add support for booting with ACPI")
Signed-off-by: Miaoqian Lin <[email protected]>
---
Changes in v2:
- add fixes tag.
- do error handling in a unified way.
- add necessary blank line.
---
drivers/usb/dwc3/dwc3-qcom.c | 11 +++++++++--
1 file changed, 9 insertions(+), 2 deletions(-)
diff --git a/drivers/usb/dwc3/dwc3-qcom.c b/drivers/usb/dwc3/dwc3-qcom.c
index 3cb01cdd02c2..f7f4af4c4ce5 100644
--- a/drivers/usb/dwc3/dwc3-qcom.c
+++ b/drivers/usb/dwc3/dwc3-qcom.c
@@ -598,8 +598,10 @@ static int dwc3_qcom_acpi_register_core(struct platform_device *pdev)
qcom->dwc3->dev.coherent_dma_mask = dev->coherent_dma_mask;
child_res = kcalloc(2, sizeof(*child_res), GFP_KERNEL);
- if (!child_res)
- return -ENOMEM;
+ if (!child_res) {
+ ret = -ENOMEM;
+ goto out;
+ }
res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
if (!res) {
@@ -637,9 +639,14 @@ static int dwc3_qcom_acpi_register_core(struct platform_device *pdev)
if (ret) {
dev_err(&pdev->dev, "failed to add device\n");
device_remove_software_node(&qcom->dwc3->dev);
+ goto out;
}
+ kfree(child_res);
+ return 0;
+
out:
+ platform_device_put(qcom->dwc3);
kfree(child_res);
return ret;
}
--
2.17.1
On Wed, Jan 05, 2022 at 06:55:17AM +0000, Miaoqian Lin wrote:
> Fix the missing platform_device_put() before return from
> dwc3_qcom_acpi_register_core in the error handling case.
>
> Fixes: 2bc02355f8ba ("usb: dwc3: qcom: Add support for booting with ACPI")
> Signed-off-by: Miaoqian Lin <[email protected]>
> ---
> Changes in v2:
> - add fixes tag.
> - do error handling in a unified way.
> - add necessary blank line.
> ---
> drivers/usb/dwc3/dwc3-qcom.c | 11 +++++++++--
> 1 file changed, 9 insertions(+), 2 deletions(-)
Does not apply to my tree at all :(
Please rebase and resend.
thanks,
greg k-h
Hi greg k-h:
> > Fixes: 2bc02355f8ba ("usb: dwc3: qcom: Add support for booting with ACPI")
> > Signed-off-by: Miaoqian Lin <[email protected]>
> > ---
> > Changes in v2:
> > - add fixes tag.
> > - do error handling in a unified way.
> > - add necessary blank line.
> > ---
> > drivers/usb/dwc3/dwc3-qcom.c | 11 +++++++++--
> > 1 file changed, 9 insertions(+), 2 deletions(-)
>
>
> Does not apply to my tree at all :(
>
> Please rebase and resend.
I see the v1 of this patch has been applied to usb-next branch.
v2 has some format fixes. I am unsure should I rebase v2 on the top of usb-next?
I am afraid to introduce more inconvenience.
Regards,
Miaoqian.
On Fri, Jan 07, 2022 at 11:07:19AM +0800, Miaoqian Lin wrote:
> Hi greg k-h:
> > > Fixes: 2bc02355f8ba ("usb: dwc3: qcom: Add support for booting with ACPI")
> > > Signed-off-by: Miaoqian Lin <[email protected]>
> > > ---
> > > Changes in v2:
> > > - add fixes tag.
> > > - do error handling in a unified way.
> > > - add necessary blank line.
> > > ---
> > > drivers/usb/dwc3/dwc3-qcom.c | 11 +++++++++--
> > > 1 file changed, 9 insertions(+), 2 deletions(-)
> >
> >
> > Does not apply to my tree at all :(
> >
> > Please rebase and resend.
>
> I see the v1 of this patch has been applied to usb-next branch.
> v2 has some format fixes. I am unsure should I rebase v2 on the top of usb-next?
> I am afraid to introduce more inconvenience.
If v1 was incorrect, please submit a patch to either fix it, or revert
it entirely.
thanks,
greg k-h