irqchip/loongarch: Fix irq_domain_alloc_fwnode() abuse
Subsystems (3)
PATCH 1/1 irqchip/loongarch: Fix irq_domain_alloc_fwnode() abuse
The recently merged LoongArch drivers paper over the lack of topology information by creating a bunch of fwnodes for the irqchips. So far, so good.
However, irq_domain_alloc_fwnode() is supposed to take a PA, and not a kernel VA blindly cast as a PA, potentially disclosing kernel VAs to userspace. In some other cases, even NULL is used as the PA, which is entertaining.
Fix this by using the actual PA of the block when available, and switch to a named fwnode in the other cases.
--- drivers/irqchip/irq-loongarch-cpu.c | 2 +- drivers/irqchip/irq-loongson-eiointc.c | 3 ++- drivers/irqchip/irq-loongson-liointc.c | 2 +- drivers/irqchip/irq-loongson-pch-msi.c | 2 +- drivers/irqchip/irq-loongson-pch-pic.c | 2 +- 5 files changed, 6 insertions(+), 5 deletions(-)
drivers/irqchip/irq-loongarch-cpu.c +1 -1
@@ -129,7 +129,7 @@ static int __init cpuintc_acpi_init(union acpi_subtable_headers *header,clear_csr_ecfg (ECFG0_IM );clear_csr_estat (ESTATF_IP ); - cpuintc_handle =irq_domain_alloc_fwnode (NULL ); + cpuintc_handle =irq_domain_alloc_named_fwnode ("CPUINTC" ); irq_domain =irq_domain_create_linear (cpuintc_handle,EXCCODE_INT_NUM , &loongarch_cpu_intc_irq_domain_ops,NULL );
drivers/irqchip/irq-loongson-eiointc.c +2 -1
@@ -348,7 +348,8 @@ int __init eiointc_acpi_init(struct irq_domain *parent,if (!priv)return -ENOMEM ; - priv->domain_handle =irq_domain_alloc_fwnode ((phys_addr_t *)acpi_eiointc); + priv->domain_handle =irq_domain_alloc_named_id_fwnode ("EIOPIC" , + acpi_eiointc->node);if (!priv->domain_handle) {pr_err ("Unable to allocate domain handle\n" ); goto out_free_priv;
drivers/irqchip/irq-loongson-liointc.c +1 -1
@@ -360,7 +360,7 @@ int __init liointc_acpi_init(struct irq_domain *parent, struct acpi_madt_lio_pic parent_irq[0 ] =irq_create_mapping (parent, acpi_liointc->cascade[0 ]); parent_irq[1 ] =irq_create_mapping (parent, acpi_liointc->cascade[1 ]); - domain_handle =irq_domain_alloc_fwnode ((phys_addr_t *)acpi_liointc); + domain_handle =irq_domain_alloc_fwnode (&acpi_liointc->address);if (!domain_handle) {pr_err ("Unable to allocate domain handle\n" );return -ENOMEM ;
drivers/irqchip/irq-loongson-pch-msi.c +1 -1
@@ -282,7 +282,7 @@ int __init pch_msi_acpi_init(struct irq_domain *parent,int ret;struct fwnode_handle *domain_handle; - domain_handle =irq_domain_alloc_fwnode ((phys_addr_t *)acpi_pchmsi); + domain_handle =irq_domain_alloc_fwnode (&acpi_pchmsi->msg_address); ret =pch_msi_init (acpi_pchmsi->msg_address, acpi_pchmsi->start, acpi_pchmsi->count, parent, domain_handle);if (ret <0 )
drivers/irqchip/irq-loongson-pch-pic.c +1 -1
@@ -349,7 +349,7 @@ int __init pch_pic_acpi_init(struct irq_domain *parent, vec_base = acpi_pchpic->gsi_base -GSI_MIN_PCH_IRQ ; - domain_handle =irq_domain_alloc_fwnode ((phys_addr_t *)acpi_pchpic); + domain_handle =irq_domain_alloc_fwnode (&acpi_pchpic->address);if (!domain_handle) {pr_err ("Unable to allocate domain handle\n" );return -ENOMEM ;
Signature · 1 line
2.34.1
Hi, Marc
Yes, I think that's right. Thanks for your patch to fix them.
Quoted 88 lines · Marc Zyngier
The recently merged LoongArch drivers paper over the lack of topology information by creating a bunch of fwnodes for the irqchips. So far, so good.
However,
irq_domain_alloc_fwnode()is supposed to take a PA, and not a kernel VA blindly cast as a PA, potentially disclosing kernel VAs to userspace. In some other cases, even NULL is used as the PA, which is entertaining.Fix this by using the actual PA of the block when available, and switch to a named fwnode in the other cases.
Signed-off-by Marc Zyngier <[email protected]>--- drivers/irqchip/irq-loongarch-cpu.c | 2 +- drivers/irqchip/irq-loongson-eiointc.c | 3 ++- drivers/irqchip/irq-loongson-liointc.c | 2 +- drivers/irqchip/irq-loongson-pch-msi.c | 2 +- drivers/irqchip/irq-loongson-pch-pic.c | 2 +- 5 files changed, 6 insertions(+), 5 deletions(-)drivers/irqchip/irq-loongarch-cpu.c +1
-1@@ -129,7 +129,7 @@ static int __init cpuintc_acpi_init(union acpi_subtable_headers *header,clear_csr_ecfg (ECFG0_IM );clear_csr_estat (ESTATF_IP ); - cpuintc_handle =irq_domain_alloc_fwnode (NULL ); + cpuintc_handle =irq_domain_alloc_named_fwnode ("CPUINTC" ); irq_domain =irq_domain_create_linear (cpuintc_handle,EXCCODE_INT_NUM , &loongarch_cpu_intc_irq_domain_ops,NULL );drivers/irqchip/irq-loongson-eiointc.c +2
-1@@ -348,7 +348,8 @@ int __init eiointc_acpi_init(struct irq_domain *parent,if (!priv)return -ENOMEM ; - priv->domain_handle =irq_domain_alloc_fwnode ((phys_addr_t *)acpi_eiointc); + priv->domain_handle =irq_domain_alloc_named_id_fwnode ("EIOPIC" , + acpi_eiointc->node);if (!priv->domain_handle) {pr_err ("Unable to allocate domain handle\n" ); goto out_free_priv;drivers/irqchip/irq-loongson-liointc.c +1
-1@@ -360,7 +360,7 @@ int __init liointc_acpi_init(struct irq_domain *parent, struct acpi_madt_lio_pic parent_irq[0 ] =irq_create_mapping (parent, acpi_liointc->cascade[0 ]); parent_irq[1 ] =irq_create_mapping (parent, acpi_liointc->cascade[1 ]); - domain_handle =irq_domain_alloc_fwnode ((phys_addr_t *)acpi_liointc); + domain_handle =irq_domain_alloc_fwnode (&acpi_liointc->address);if (!domain_handle) {pr_err ("Unable to allocate domain handle\n" );return -ENOMEM ;drivers/irqchip/irq-loongson-pch-msi.c +1
-1@@ -282,7 +282,7 @@ int __init pch_msi_acpi_init(struct irq_domain *parent,int ret;struct fwnode_handle *domain_handle; - domain_handle =irq_domain_alloc_fwnode ((phys_addr_t *)acpi_pchmsi); + domain_handle =irq_domain_alloc_fwnode (&acpi_pchmsi->msg_address); ret =pch_msi_init (acpi_pchmsi->msg_address, acpi_pchmsi->start, acpi_pchmsi->count, parent, domain_handle);if (ret <0 )drivers/irqchip/irq-loongson-pch-pic.c +1
-1@@ -349,7 +349,7 @@ int __init pch_pic_acpi_init(struct irq_domain *parent, vec_base = acpi_pchpic->gsi_base -GSI_MIN_PCH_IRQ ; - domain_handle =irq_domain_alloc_fwnode ((phys_addr_t *)acpi_pchpic); + domain_handle =irq_domain_alloc_fwnode (&acpi_pchpic->address);if (!domain_handle) {pr_err ("Unable to allocate domain handle\n" );return -ENOMEM ;
Hi Jianmin,
Quoted 4 lines · Jianmin Lv
Hi, Marc
Yes, I think that's right. Thanks for your patch to fix them.
Thanks for having a look. Is that an Acked-by? A Reviewed-by? Or just a comment?
Thanks,
M.
Signature · 1 line
Without deviation from the norm, progress is not possible.
Jianmin Lv
Reviewed-byQuoted 7 lines · Marc Zyngier
Hi Jianmin,
Quoted 3 lines · Jianmin Lv
Hi, Marc
Quoted 9 lines
Quoted 1 line
Yes, I think that's right. Thanks for your patch to fix them.
Thanks for having a look. Is that an Acked-by? A Reviewed-by? Or just a comment?
Thanks,
M.
Thanks.
The following commit has been merged into the irq/irqchip-fixes branch of irqchip:
The following commit has been merged into the irq/irqchip-fixes branch of irqchip:
Commit-ID: 7e4fd7a1a6fdf23d069eeb0ae0e8e46b9fb40723 Gitweb: https://git.kernel.org/pub/scm/linux/kernel/git/maz/arm-platforms/7e4fd7a1a6fdf23d069eeb0ae0e8e46b9fb40723 Author: Marc Zyngier <[email protected]> AuthorDate: Mon, 08 Aug 2022 11:50:20 +01:00 Committer: Marc Zyngier <[email protected]> CommitterDate: Tue, 09 Aug 2022 06:54:05 +01:00
irqchip/loongarch: Fix irq_domain_alloc_fwnode() abuse
The recently merged LoongArch drivers paper over the lack of topology information by creating a bunch of fwnodes for the irqchips. So far, so good.
However, irq_domain_alloc_fwnode() is supposed to take a PA, and not a kernel VA blindly cast as a PA, potentially disclosing kernel VAs to userspace. In some other cases, even NULL is used as the PA, which is entertaining.
Fix this by using the actual PA of the block when available, and switch to a named fwnode in the other cases.
--- drivers/irqchip/irq-loongarch-cpu.c | 2 +- drivers/irqchip/irq-loongson-eiointc.c | 3 ++- drivers/irqchip/irq-loongson-liointc.c | 2 +- drivers/irqchip/irq-loongson-pch-msi.c | 2 +- drivers/irqchip/irq-loongson-pch-pic.c | 2 +- 5 files changed, 6 insertions(+), 5 deletions(-)
drivers/irqchip/irq-loongarch-cpu.c +1 -1
@@ -129,7 +129,7 @@ static int __init cpuintc_acpi_init(union acpi_subtable_headers *header,clear_csr_ecfg (ECFG0_IM );clear_csr_estat (ESTATF_IP ); - cpuintc_handle =irq_domain_alloc_fwnode (NULL ); + cpuintc_handle =irq_domain_alloc_named_fwnode ("CPUINTC" ); irq_domain =irq_domain_create_linear (cpuintc_handle,EXCCODE_INT_NUM , &loongarch_cpu_intc_irq_domain_ops,NULL );
drivers/irqchip/irq-loongson-eiointc.c +2 -1
@@ -348,7 +348,8 @@ int __init eiointc_acpi_init(struct irq_domain *parent,if (!priv)return -ENOMEM ; - priv->domain_handle =irq_domain_alloc_fwnode ((phys_addr_t *)acpi_eiointc); + priv->domain_handle =irq_domain_alloc_named_id_fwnode ("EIOPIC" , + acpi_eiointc->node);if (!priv->domain_handle) {pr_err ("Unable to allocate domain handle\n" ); goto out_free_priv;
drivers/irqchip/irq-loongson-liointc.c +1 -1
@@ -360,7 +360,7 @@ int __init liointc_acpi_init(struct irq_domain *parent, struct acpi_madt_lio_pic parent_irq[0 ] =irq_create_mapping (parent, acpi_liointc->cascade[0 ]); parent_irq[1 ] =irq_create_mapping (parent, acpi_liointc->cascade[1 ]); - domain_handle =irq_domain_alloc_fwnode ((phys_addr_t *)acpi_liointc); + domain_handle =irq_domain_alloc_fwnode (&acpi_liointc->address);if (!domain_handle) {pr_err ("Unable to allocate domain handle\n" );return -ENOMEM ;
drivers/irqchip/irq-loongson-pch-msi.c +1 -1
@@ -282,7 +282,7 @@ int __init pch_msi_acpi_init(struct irq_domain *parent,int ret;struct fwnode_handle *domain_handle; - domain_handle =irq_domain_alloc_fwnode ((phys_addr_t *)acpi_pchmsi); + domain_handle =irq_domain_alloc_fwnode (&acpi_pchmsi->msg_address); ret =pch_msi_init (acpi_pchmsi->msg_address, acpi_pchmsi->start, acpi_pchmsi->count, parent, domain_handle);if (ret <0 )
drivers/irqchip/irq-loongson-pch-pic.c +1 -1
@@ -349,7 +349,7 @@ int __init pch_pic_acpi_init(struct irq_domain *parent, vec_base = acpi_pchpic->gsi_base -GSI_MIN_PCH_IRQ ; - domain_handle =irq_domain_alloc_fwnode ((phys_addr_t *)acpi_pchpic); + domain_handle =irq_domain_alloc_fwnode (&acpi_pchpic->address);if (!domain_handle) {pr_err ("Unable to allocate domain handle\n" );return -ENOMEM ;