usb: chipidea: ci_hdrc_imx: Propagate errors from optional IRQ lookup

From: bui duc phuc <[email protected]>

devm_kasprintf() can fail when allocating the wakeup IRQ name. The error was logged with dev_err_probe(), but its return value was ignored and probe could continue with a successful return value.

Store the error returned by dev_err_probe() in ret and jump to the error path to propagate the failure.

Reviewed-by Frank Li <[email protected]>

Acked-by Peter Chen <[email protected]>

Reported-by Sashiko Bot <[email protected]>

Link https://lore.kernel.org/all/[email protected]/ open here

Signed-off-by bui duc phuc <[email protected]>

---

Link v2:
https://lore.kernel.org/all/[email protected]/
Changes in v3:
- Use the phy_shutdown label instead of err_clk as suggested by Sashiko's review.
- Add Peter Chen's Acked-by tag.
- Add Frank Li's Reviewed-by tag.

 drivers/usb/chipidea/ci_hdrc_imx.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

drivers/usb/chipidea/ci_hdrc_imx.c +3 -3

index 9e529398c607..edbf9df9b8f2 100644
@@ -532,8 +532,8 @@ static int ci_hdrc_imx_probe(struct platform_device *pdev)
 	if (data->wakeup_irq > 0) {
 		irq_name = devm_kasprintf(dev, GFP_KERNEL, "%s:wakeup", pdata.name);
 		if (!irq_name) {
-			dev_err_probe(dev, -ENOMEM, "failed to create irq_name\n");
-			goto err_clk;
+			ret = dev_err_probe(dev, -ENOMEM, "failed to create irq_name\n");
+			goto phy_shutdown;
 		}
 
 		ret = devm_request_threaded_irq(dev, data->wakeup_irq,

@@ -541,7 +541,7 @@ static int ci_hdrc_imx_probe(struct platform_device *pdev)
 						IRQF_ONESHOT | IRQF_NO_AUTOEN,
 						irq_name, data);
 		if (ret)
-			goto err_clk;
+			goto phy_shutdown;
 	}
 
 	ret = imx_usbmisc_init(data->usbmisc_data);

Signature · 1 line

2.43.0

This patch did not apply, please rebase and resend.

[Severity: High]
This is a pre-existing issue, but missing an assignment to ret here causes the probe to falsely succeed:

drivers/usb/chipidea/ci_hdrc_imx.c:ci_hdrc_imx_probe() {
    ...
        if (data->wakeup_irq > 0) {
                irq_name = devm_kasprintf(dev, GFP_KERNEL, "%s:wakeup", pdata.name);
                if (!irq_name) {
                        dev_err_probe(dev, -ENOMEM, "failed to create irq_name\n");
                        goto err_clk;
                }
    ...
}

Because dev_err_probe() is called but its return value is not assigned to ret, and ret is 0 at this point, the probe function incorrectly returns 0 (success) despite the memory allocation failure.

Does this code need to assign the error to ret before jumping to err_clk?

From: bui duc phuc <[email protected]>

platform_get_irq_optional() returns a positive IRQ number on success or a negative error code on failure. For an optional IRQ, -ENXIO indicates that no IRQ is available, while other errors should be propagated.

Propagate errors such as -EPROBE_DEFER and -EINVAL instead of continuing probe without the IRQ.

Acked-by Peter Chen <[email protected]>

Signed-off-by bui duc phuc <[email protected]>

---

Link v2:
https://lore.kernel.org/all/[email protected]/
Changes in v3:
- Use the phy_shutdown label instead of err_clk as suggested by Sashiko's review.
- Add Peter Chen's Acked-by tag.

 drivers/usb/chipidea/ci_hdrc_imx.c | 4 ++++
 1 file changed, 4 insertions(+)

drivers/usb/chipidea/ci_hdrc_imx.c +4 -1

index 56d2ba824a0b..9e529398c607 100644
@@ -525,6 +525,10 @@ static int ci_hdrc_imx_probe(struct platform_device *pdev)
 		data->supports_runtime_pm = true;
 
 	data->wakeup_irq = platform_get_irq_optional(pdev, 1);
+	if (data->wakeup_irq < 0 && data->wakeup_irq != -ENXIO) {
+		ret = data->wakeup_irq;
+		goto phy_shutdown;
+	}
 	if (data->wakeup_irq > 0) {
 		irq_name = devm_kasprintf(dev, GFP_KERNEL, "%s:wakeup", pdata.name);
 		if (!irq_name) {
--

2.43.0