[v1] irqchip/riscv-rpmi-sysmsi: Fix mailbox channel leak in rpmi_sysmsi_probe()

[PATCH] irqchip/riscv-rpmi-sysmsi: Fix mailbox channel leak in rpmi_sysmsi_probe()

Posted by Felix Gu 3 weeks, 1 day ago

When riscv_acpi_get_gsi_info() fails, the mailbox channel previously
requested via mbox_request_channel() is not freed. Add the missing
mbox_free_channel() call to prevent the resource leak.

Fixes: 4752b0cfbc37 ("irqchip/riscv-rpmi-sysmsi: Add ACPI support")
Signed-off-by: Felix Gu <ustc.gu@gmail.com>
---
 drivers/irqchip/irq-riscv-rpmi-sysmsi.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/drivers/irqchip/irq-riscv-rpmi-sysmsi.c b/drivers/irqchip/irq-riscv-rpmi-sysmsi.c
index 5c74c561ce31..612f3972f7af 100644
--- a/drivers/irqchip/irq-riscv-rpmi-sysmsi.c
+++ b/drivers/irqchip/irq-riscv-rpmi-sysmsi.c
@@ -250,6 +250,7 @@ static int rpmi_sysmsi_probe(struct platform_device *pdev)
 		rc = riscv_acpi_get_gsi_info(fwnode, &priv->gsi_base, &id,
 					     &nr_irqs, NULL);
 		if (rc) {
+			mbox_free_channel(priv->chan);
 			dev_err(dev, "failed to find GSI mapping\n");
 			return rc;
 		}

---
base-commit: b84a0ebe421ca56995ff78b66307667b62b3a900
change-id: 20260315-sysmsi-f6254f65701f

Best regards,
-- 
Felix Gu <ustc.gu@gmail.com>

Re: [PATCH] irqchip/riscv-rpmi-sysmsi: Fix mailbox channel leak in rpmi_sysmsi_probe()

Posted by Markus Elfring 3 weeks ago

> When riscv_acpi_get_gsi_info() fails, the mailbox channel previously
> requested via mbox_request_channel() is not freed. Add the missing
> mbox_free_channel() call to prevent the resource leak.

How do you think about to increase the application of scope-based resource management?
https://elixir.bootlin.com/linux/v7.0-rc3/source/drivers/mailbox/mailbox.c#L465-L496
https://elixir.bootlin.com/linux/v7.0-rc3/source/drivers/irqchip/irq-riscv-rpmi-sysmsi.c#L210-L307


Were any source code analysis tools involved here?


See also once more:
https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/tree/Documentation/process/stable-kernel-rules.rst?h=v7.0-rc3#n34

Regards,
Markus

Re: [PATCH] irqchip/riscv-rpmi-sysmsi: Fix mailbox channel leak in rpmi_sysmsi_probe()

Posted by Rahul Pathak 3 weeks, 1 day ago

On Sun, Mar 15, 2026 at 12:48 PM Felix Gu <ustc.gu@gmail.com> wrote:
>
> When riscv_acpi_get_gsi_info() fails, the mailbox channel previously
> requested via mbox_request_channel() is not freed. Add the missing
> mbox_free_channel() call to prevent the resource leak.
>
> Fixes: 4752b0cfbc37 ("irqchip/riscv-rpmi-sysmsi: Add ACPI support")
> Signed-off-by: Felix Gu <ustc.gu@gmail.com>
> ---
>  drivers/irqchip/irq-riscv-rpmi-sysmsi.c | 1 +
>  1 file changed, 1 insertion(+)
>
> diff --git a/drivers/irqchip/irq-riscv-rpmi-sysmsi.c b/drivers/irqchip/irq-riscv-rpmi-sysmsi.c
> index 5c74c561ce31..612f3972f7af 100644
> --- a/drivers/irqchip/irq-riscv-rpmi-sysmsi.c
> +++ b/drivers/irqchip/irq-riscv-rpmi-sysmsi.c
> @@ -250,6 +250,7 @@ static int rpmi_sysmsi_probe(struct platform_device *pdev)
>                 rc = riscv_acpi_get_gsi_info(fwnode, &priv->gsi_base, &id,
>                                              &nr_irqs, NULL);
>                 if (rc) {
> +                       mbox_free_channel(priv->chan);
>                         dev_err(dev, "failed to find GSI mapping\n");
>                         return rc;
>                 }
>

Reviewed-by: Rahul Pathak <rahul@summations.net>

[tip: irq/urgent] irqchip/riscv-rpmi-sysmsi: Fix mailbox channel leak in rpmi_sysmsi_probe()

Posted by tip-bot2 for Felix Gu 2 weeks, 6 days ago

The following commit has been merged into the irq/urgent branch of tip:

Commit-ID:     76f0930d6e809234904cf9f0f5f42ee6c1dc694e
Gitweb:        https://git.kernel.org/tip/76f0930d6e809234904cf9f0f5f42ee6c1dc694e
Author:        Felix Gu <ustc.gu@gmail.com>
AuthorDate:    Sun, 15 Mar 2026 15:17:54 +08:00
Committer:     Thomas Gleixner <tglx@kernel.org>
CommitterDate: Tue, 17 Mar 2026 11:16:15 +01:00

irqchip/riscv-rpmi-sysmsi: Fix mailbox channel leak in rpmi_sysmsi_probe()

When riscv_acpi_get_gsi_info() fails, the mailbox channel previously
requested via mbox_request_channel() is not freed. Add the missing
mbox_free_channel() call to prevent the resource leak.

Fixes: 4752b0cfbc37 ("irqchip/riscv-rpmi-sysmsi: Add ACPI support")
Signed-off-by: Felix Gu <ustc.gu@gmail.com>
Signed-off-by: Thomas Gleixner <tglx@kernel.org>
Cc: stable@vger.kernel.org
Reviewed-by: Rahul Pathak <rahul@summations.net>
Link: https://patch.msgid.link/20260315-sysmsi-v1-1-5f090c86c2ca@gmail.com
---
 drivers/irqchip/irq-riscv-rpmi-sysmsi.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/drivers/irqchip/irq-riscv-rpmi-sysmsi.c b/drivers/irqchip/irq-riscv-rpmi-sysmsi.c
index 5c74c56..612f397 100644
--- a/drivers/irqchip/irq-riscv-rpmi-sysmsi.c
+++ b/drivers/irqchip/irq-riscv-rpmi-sysmsi.c
@@ -250,6 +250,7 @@ static int rpmi_sysmsi_probe(struct platform_device *pdev)
 		rc = riscv_acpi_get_gsi_info(fwnode, &priv->gsi_base, &id,
 					     &nr_irqs, NULL);
 		if (rc) {
+			mbox_free_channel(priv->chan);
 			dev_err(dev, "failed to find GSI mapping\n");
 			return rc;
 		}