2021-06-29 11:29:35

by luanshi

Subject: [PATCH] ACPI / amba: Fix resource name in /proc/iomem

In function amba_handler_attach(), dev->res.name is initialized by
amba_device_alloc. But when address_found is false, dev->res.name is
assigned to null value, which leads to wrong resource name display in
/proc/iomem, "<BAD>" is seen for those resources.

Signed-off-by: Liguang Zhang <[email protected]>
---
drivers/acpi/acpi_amba.c | 1 +
1 file changed, 1 insertion(+)

diff --git a/drivers/acpi/acpi_amba.c b/drivers/acpi/acpi_amba.c
index 49b781a9cd97..ab8a4e0191b1 100644
--- a/drivers/acpi/acpi_amba.c
+++ b/drivers/acpi/acpi_amba.c
@@ -76,6 +76,7 @@ static int amba_handler_attach(struct acpi_device *adev,
case IORESOURCE_MEM:
if (!address_found) {
dev->res = *rentry->res;
+ dev->res.name = dev_name(&dev->dev);
address_found = true;
}
break;
--
2.19.1.6.gb485710b

2021-06-30 18:05:07

by Rafael J. Wysocki

Subject: Re: [PATCH] ACPI / amba: Fix resource name in /proc/iomem

On Tue, Jun 29, 2021 at 1:28 PM Liguang Zhang
<[email protected]> wrote:
>
> In function amba_handler_attach(), dev->res.name is initialized by
> amba_device_alloc. But when address_found is false, dev->res.name is
> assigned to null value, which leads to wrong resource name display in
> /proc/iomem, "<BAD>" is seen for those resources.
>
> Signed-off-by: Liguang Zhang <[email protected]>
> ---
> drivers/acpi/acpi_amba.c | 1 +
> 1 file changed, 1 insertion(+)
>
> diff --git a/drivers/acpi/acpi_amba.c b/drivers/acpi/acpi_amba.c
> index 49b781a9cd97..ab8a4e0191b1 100644
> --- a/drivers/acpi/acpi_amba.c
> +++ b/drivers/acpi/acpi_amba.c
> @@ -76,6 +76,7 @@ static int amba_handler_attach(struct acpi_device *adev,
> case IORESOURCE_MEM:
> if (!address_found) {
> dev->res = *rentry->res;
> + dev->res.name = dev_name(&dev->dev);
> address_found = true;
> }
> break;
> --

Applied as 5.14-rc1 material, thanks!