* [PATCH] LoongArch: KVM: Validate MSI data before routing it to EIOINTC
@ 2026-08-28 9:36 Zeng Chi
2026-08-28 10:02 ` sashiko-bot
` (3 more replies)
0 siblings, 4 replies; 6+ messages in thread
From: Zeng Chi @ 2026-08-28 9:36 UTC (permalink / raw)
To: zhaotianrui, maobibo, chenhuacai
Cc: yury.norov, kvm, loongarch, linux-kernel, zengchi, stable,
Sashiko
From: Zeng Chi <zengchi@kylinos.cn>
pch_msi_set_irq() passes e->msi.data straight into eiointc_set_irq() as
the irq number. The MSI data comes from userspace, either via a
KVM_IRQ_ROUTING_MSI entry set with KVM_SET_GSI_ROUTING (used by irqfd
and KVM_IRQ_LINE) or directly via KVM_SIGNAL_MSI, and is never checked
against EIOINTC_IRQS.
eiointc_set_irq() uses the value with __set_bit()/__clear_bit() on the
256-bit isr bitmap, eiointc_update_irq() then indexes sw_coremap[] and
the per-cpu coreisr/sw_coreisr bitmaps with it. A data value >= 256
therefore reads and writes memory past the end of those arrays, i.e.
any process holding a VM fd can corrupt kernel memory beyond the
loongarch_eiointc allocation.
Reject MSI data that doesn't fit in the EIOINTC irq space. The DMSINTC
path is unaffected as it decodes the vector from the address and masks
it.
Fixes: 1928254c5ccb ("LoongArch: KVM: Add irqfd support")
Cc: stable@vger.kernel.org
Reported-by: Sashiko <sashiko-bot@kernel.org>
Closes: https://lore.kernel.org/all/20260531140921.1B1181F00893@smtp.kernel.org/
Signed-off-by: Zeng Chi <zengchi@kylinos.cn>
---
arch/loongarch/kvm/intc/pch_pic.c | 3 +++
1 file changed, 3 insertions(+)
diff --git a/arch/loongarch/kvm/intc/pch_pic.c b/arch/loongarch/kvm/intc/pch_pic.c
index e7b77705c516..81fb534ce8dd 100644
--- a/arch/loongarch/kvm/intc/pch_pic.c
+++ b/arch/loongarch/kvm/intc/pch_pic.c
@@ -78,6 +78,9 @@ int pch_msi_set_irq(struct kvm *kvm, struct kvm_kernel_irq_routing_entry *e, int
return dmsintc_set_irq(kvm, msg_addr, e->msi.data, level);
}
+ if (e->msi.data >= EIOINTC_IRQS)
+ return -EINVAL;
+
eiointc_set_irq(kvm->arch.eiointc, e->msi.data, level);
return 0;
--
2.25.1
No virus found
Checked by Hillstone Network AntiVirus
^ permalink raw reply related [flat|nested] 6+ messages in thread
* Re: [PATCH] LoongArch: KVM: Validate MSI data before routing it to EIOINTC
2026-08-28 9:36 [PATCH] LoongArch: KVM: Validate MSI data before routing it to EIOINTC Zeng Chi
@ 2026-08-28 10:02 ` sashiko-bot
2026-08-31 1:25 ` Bibo Mao
` (2 subsequent siblings)
3 siblings, 0 replies; 6+ messages in thread
From: sashiko-bot @ 2026-08-28 10:02 UTC (permalink / raw)
To: Zeng Chi; +Cc: kvm
Thank you for your contribution! Sashiko AI review found 1 potential issue(s) to consider:
Pre-existing issues:
- [Critical] Preexisting NULL pointer dereference in pch_pic_update_irq() when EIOINTC is not instantiated.
--
commit 2e412c04f647995bc67015a157c68cab104e2514
Author: Zeng Chi <zengchi@kylinos.cn>
LoongArch: KVM: Validate MSI data before routing it to EIOINTC
pch_msi_set_irq() passes e->msi.data straight into eiointc_set_irq() as
the irq number. The MSI data comes from userspace and is never checked
against EIOINTC_IRQS, which can corrupt kernel memory. This patch
rejects MSI data that doesn't fit in the EIOINTC irq space.
> diff --git a/arch/loongarch/kvm/intc/pch_pic.c b/arch/loongarch/kvm/intc/pch_pic.c
> index e7b77705c516a..81fb534ce8dd5 100644
> --- a/arch/loongarch/kvm/intc/pch_pic.c
> +++ b/arch/loongarch/kvm/intc/pch_pic.c
> @@ -78,6 +78,9 @@ int pch_msi_set_irq(struct kvm *kvm, struct kvm_kernel_irq_routing_entry *e, int
> return dmsintc_set_irq(kvm, msg_addr, e->msi.data, level);
> }
>
> + if (e->msi.data >= EIOINTC_IRQS)
> + return -EINVAL;
> +
> eiointc_set_irq(kvm->arch.eiointc, e->msi.data, level);
[Severity: Critical]
This isn't a bug introduced by this patch, but is it possible for
s->kvm->arch.eiointc to be unconditionally dereferenced as a NULL pointer
in pch_pic_update_irq() when the EIOINTC device is not instantiated?
A KVM userspace process can create a KVM_DEV_TYPE_LOONGARCH_PCHPIC device
via ioctl without creating the KVM_DEV_TYPE_LOONGARCH_EIOINTC device.
If the process pre-populates the irr (Interrupt Request Register) of the
PCHPIC device using the KVM_SET_DEVICE_ATTR ioctl, and then runs a guest
VCPU to perform an MMIO write to PCH_PIC_MASK_START to unmask the pending
interrupt, it bypasses standard KVM IRQ injection checks.
This results in the following path:
loongarch_pch_pic_write() -> pch_pic_update_batch_irqs() -> pch_pic_update_irq()
arch/loongarch/kvm/intc/pch_pic.c:pch_pic_update_irq() {
...
if (level) {
if (mask & s->irr & ~s->mask) {
s->isr |= mask;
irq = s->htmsi_vector[irq];
eiointc_set_irq(s->kvm->arch.eiointc, irq, level);
...
}
Because EIOINTC was never created, the pointer is NULL. Because
eiointc_set_irq() unconditionally dereferences it via s->isr, can this
malicious guest action trigger an immediate host kernel panic?
>
> return 0;
> }
--
Sashiko AI review · https://sashiko.dev/#/patchset/20260828093604.56622-1-zeng_chi911@163.com?part=1
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH] LoongArch: KVM: Validate MSI data before routing it to EIOINTC
2026-08-28 9:36 [PATCH] LoongArch: KVM: Validate MSI data before routing it to EIOINTC Zeng Chi
2026-08-28 10:02 ` sashiko-bot
@ 2026-08-31 1:25 ` Bibo Mao
2026-08-31 4:50 ` Tao Cui
2026-09-05 15:10 ` Huacai Chen
3 siblings, 0 replies; 6+ messages in thread
From: Bibo Mao @ 2026-08-31 1:25 UTC (permalink / raw)
To: Zeng Chi, zhaotianrui, chenhuacai
Cc: yury.norov, kvm, loongarch, linux-kernel, zengchi, stable,
Sashiko
On 2026/8/28 下午5:36, Zeng Chi wrote:
> From: Zeng Chi <zengchi@kylinos.cn>
>
> pch_msi_set_irq() passes e->msi.data straight into eiointc_set_irq() as
> the irq number. The MSI data comes from userspace, either via a
> KVM_IRQ_ROUTING_MSI entry set with KVM_SET_GSI_ROUTING (used by irqfd
> and KVM_IRQ_LINE) or directly via KVM_SIGNAL_MSI, and is never checked
> against EIOINTC_IRQS.
>
> eiointc_set_irq() uses the value with __set_bit()/__clear_bit() on the
> 256-bit isr bitmap, eiointc_update_irq() then indexes sw_coremap[] and
> the per-cpu coreisr/sw_coreisr bitmaps with it. A data value >= 256
> therefore reads and writes memory past the end of those arrays, i.e.
> any process holding a VM fd can corrupt kernel memory beyond the
> loongarch_eiointc allocation.
>
> Reject MSI data that doesn't fit in the EIOINTC irq space. The DMSINTC
> path is unaffected as it decodes the vector from the address and masks
> it.
>
> Fixes: 1928254c5ccb ("LoongArch: KVM: Add irqfd support")
> Cc: stable@vger.kernel.org
> Reported-by: Sashiko <sashiko-bot@kernel.org>
> Closes: https://lore.kernel.org/all/20260531140921.1B1181F00893@smtp.kernel.org/
> Signed-off-by: Zeng Chi <zengchi@kylinos.cn>
> ---
> arch/loongarch/kvm/intc/pch_pic.c | 3 +++
> 1 file changed, 3 insertions(+)
>
> diff --git a/arch/loongarch/kvm/intc/pch_pic.c b/arch/loongarch/kvm/intc/pch_pic.c
> index e7b77705c516..81fb534ce8dd 100644
> --- a/arch/loongarch/kvm/intc/pch_pic.c
> +++ b/arch/loongarch/kvm/intc/pch_pic.c
> @@ -78,6 +78,9 @@ int pch_msi_set_irq(struct kvm *kvm, struct kvm_kernel_irq_routing_entry *e, int
> return dmsintc_set_irq(kvm, msg_addr, e->msi.data, level);
> }
>
> + if (e->msi.data >= EIOINTC_IRQS)
> + return -EINVAL;
> +
> eiointc_set_irq(kvm->arch.eiointc, e->msi.data, level);
>
> return 0;
>
Reviewed-by: Bibo Mao <maobibo@loongson.cn>
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH] LoongArch: KVM: Validate MSI data before routing it to EIOINTC
2026-08-28 9:36 [PATCH] LoongArch: KVM: Validate MSI data before routing it to EIOINTC Zeng Chi
2026-08-28 10:02 ` sashiko-bot
2026-08-31 1:25 ` Bibo Mao
@ 2026-08-31 4:50 ` Tao Cui
2026-09-05 15:10 ` Huacai Chen
3 siblings, 0 replies; 6+ messages in thread
From: Tao Cui @ 2026-08-31 4:50 UTC (permalink / raw)
To: Zeng Chi, zhaotianrui, maobibo, chenhuacai
Cc: cui.tao, yury.norov, kvm, loongarch, linux-kernel, zengchi,
stable, Sashiko
在 2026/8/28 17:36, Zeng Chi 写道:
> From: Zeng Chi <zengchi@kylinos.cn>
>
> pch_msi_set_irq() passes e->msi.data straight into eiointc_set_irq() as
> the irq number. The MSI data comes from userspace, either via a
> KVM_IRQ_ROUTING_MSI entry set with KVM_SET_GSI_ROUTING (used by irqfd
> and KVM_IRQ_LINE) or directly via KVM_SIGNAL_MSI, and is never checked
> against EIOINTC_IRQS.
>
> eiointc_set_irq() uses the value with __set_bit()/__clear_bit() on the
> 256-bit isr bitmap, eiointc_update_irq() then indexes sw_coremap[] and
> the per-cpu coreisr/sw_coreisr bitmaps with it. A data value >= 256
> therefore reads and writes memory past the end of those arrays, i.e.
> any process holding a VM fd can corrupt kernel memory beyond the
> loongarch_eiointc allocation.
>
> Reject MSI data that doesn't fit in the EIOINTC irq space. The DMSINTC
> path is unaffected as it decodes the vector from the address and masks
> it.
>
> Fixes: 1928254c5ccb ("LoongArch: KVM: Add irqfd support")
> Cc: stable@vger.kernel.org
> Reported-by: Sashiko <sashiko-bot@kernel.org>
> Closes: https://lore.kernel.org/all/20260531140921.1B1181F00893@smtp.kernel.org/
> Signed-off-by: Zeng Chi <zengchi@kylinos.cn>
> ---
> arch/loongarch/kvm/intc/pch_pic.c | 3 +++
> 1 file changed, 3 insertions(+)
>
> diff --git a/arch/loongarch/kvm/intc/pch_pic.c b/arch/loongarch/kvm/intc/pch_pic.c
> index e7b77705c516..81fb534ce8dd 100644
> --- a/arch/loongarch/kvm/intc/pch_pic.c
> +++ b/arch/loongarch/kvm/intc/pch_pic.c
> @@ -78,6 +78,9 @@ int pch_msi_set_irq(struct kvm *kvm, struct kvm_kernel_irq_routing_entry *e, int
> return dmsintc_set_irq(kvm, msg_addr, e->msi.data, level);
> }
>
> + if (e->msi.data >= EIOINTC_IRQS)
> + return -EINVAL;
> +
> eiointc_set_irq(kvm->arch.eiointc, e->msi.data, level);
>
> return 0;
Nice fix, thanks!
Reviewed-by: Tao Cui <cuitao@kylinos.cn>
BTW, the NULL deref in pch_pic_update_irq() that Sashiko mentioned is
a pre-existing issue — it might be worth addressing in a separate
patch:
https://lore.kernel.org/all/20260828100204.CC38D1F000E9@smtp.kernel.org/
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH] LoongArch: KVM: Validate MSI data before routing it to EIOINTC
2026-08-28 9:36 [PATCH] LoongArch: KVM: Validate MSI data before routing it to EIOINTC Zeng Chi
` (2 preceding siblings ...)
2026-08-31 4:50 ` Tao Cui
@ 2026-09-05 15:10 ` Huacai Chen
2026-09-08 6:47 ` Zeng Chi
3 siblings, 1 reply; 6+ messages in thread
From: Huacai Chen @ 2026-09-05 15:10 UTC (permalink / raw)
To: Zeng Chi
Cc: zhaotianrui, maobibo, yury.norov, kvm, loongarch, linux-kernel,
zengchi, stable, Sashiko
Applied, thanks.
Huacai
On Fri, Aug 28, 2026 at 5:36 PM Zeng Chi <zeng_chi911@163.com> wrote:
>
> From: Zeng Chi <zengchi@kylinos.cn>
>
> pch_msi_set_irq() passes e->msi.data straight into eiointc_set_irq() as
> the irq number. The MSI data comes from userspace, either via a
> KVM_IRQ_ROUTING_MSI entry set with KVM_SET_GSI_ROUTING (used by irqfd
> and KVM_IRQ_LINE) or directly via KVM_SIGNAL_MSI, and is never checked
> against EIOINTC_IRQS.
>
> eiointc_set_irq() uses the value with __set_bit()/__clear_bit() on the
> 256-bit isr bitmap, eiointc_update_irq() then indexes sw_coremap[] and
> the per-cpu coreisr/sw_coreisr bitmaps with it. A data value >= 256
> therefore reads and writes memory past the end of those arrays, i.e.
> any process holding a VM fd can corrupt kernel memory beyond the
> loongarch_eiointc allocation.
>
> Reject MSI data that doesn't fit in the EIOINTC irq space. The DMSINTC
> path is unaffected as it decodes the vector from the address and masks
> it.
>
> Fixes: 1928254c5ccb ("LoongArch: KVM: Add irqfd support")
> Cc: stable@vger.kernel.org
> Reported-by: Sashiko <sashiko-bot@kernel.org>
> Closes: https://lore.kernel.org/all/20260531140921.1B1181F00893@smtp.kernel.org/
> Signed-off-by: Zeng Chi <zengchi@kylinos.cn>
> ---
> arch/loongarch/kvm/intc/pch_pic.c | 3 +++
> 1 file changed, 3 insertions(+)
>
> diff --git a/arch/loongarch/kvm/intc/pch_pic.c b/arch/loongarch/kvm/intc/pch_pic.c
> index e7b77705c516..81fb534ce8dd 100644
> --- a/arch/loongarch/kvm/intc/pch_pic.c
> +++ b/arch/loongarch/kvm/intc/pch_pic.c
> @@ -78,6 +78,9 @@ int pch_msi_set_irq(struct kvm *kvm, struct kvm_kernel_irq_routing_entry *e, int
> return dmsintc_set_irq(kvm, msg_addr, e->msi.data, level);
> }
>
> + if (e->msi.data >= EIOINTC_IRQS)
> + return -EINVAL;
> +
> eiointc_set_irq(kvm->arch.eiointc, e->msi.data, level);
>
> return 0;
> --
> 2.25.1
>
>
> No virus found
> Checked by Hillstone Network AntiVirus
>
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH] LoongArch: KVM: Validate MSI data before routing it to EIOINTC
2026-09-05 15:10 ` Huacai Chen
@ 2026-09-08 6:47 ` Zeng Chi
0 siblings, 0 replies; 6+ messages in thread
From: Zeng Chi @ 2026-09-08 6:47 UTC (permalink / raw)
To: Huacai Chen
Cc: zhaotianrui, maobibo, yury.norov, kvm, loongarch, linux-kernel,
zengchi, stable, Sashiko
On 2026/9/5 23:10, Huacai Chen wrote:
> Applied, thanks.
>
>
> Huacai
>
Thank you, Huacai, for applying the patch. I really appreciate your
time and the LoongArch maintainers' support.
Best,
Zeng Chi
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2026-09-08 6:48 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2026-08-28 9:36 [PATCH] LoongArch: KVM: Validate MSI data before routing it to EIOINTC Zeng Chi
2026-08-28 10:02 ` sashiko-bot
2026-08-31 1:25 ` Bibo Mao
2026-08-31 4:50 ` Tao Cui
2026-09-05 15:10 ` Huacai Chen
2026-09-08 6:47 ` Zeng Chi
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox