]> git.ipfire.org Git - thirdparty/linux.git/commitdiff
RISC-V: KVM: Fix null pointer dereference in kvm_riscv_aia_imsic_rw_attr()
authorJiakai Xu <jiakaipeanut@gmail.com>
Tue, 27 Jan 2026 07:22:19 +0000 (07:22 +0000)
committerAnup Patel <anup@brainfault.org>
Fri, 6 Feb 2026 13:35:06 +0000 (19:05 +0530)
Add a null pointer check for imsic_state before dereferencing it in
kvm_riscv_aia_imsic_rw_attr(). While the function checks that the
vcpu exists, it doesn't verify that the vcpu's imsic_state has been
initialized, leading to a null pointer dereference when accessed.

The crash manifests as:
  Unable to handle kernel paging request at virtual address
  dfffffff00000006
  ...
  kvm_riscv_aia_imsic_rw_attr+0x2d8/0x854 arch/riscv/kvm/aia_imsic.c:958
  aia_set_attr+0x2ee/0x1726 arch/riscv/kvm/aia_device.c:354
  kvm_device_ioctl_attr virt/kvm/kvm_main.c:4744 [inline]
  kvm_device_ioctl+0x296/0x374 virt/kvm/kvm_main.c:4761
  vfs_ioctl fs/ioctl.c:51 [inline]
  ...

The fix adds a check to return -ENODEV if imsic_state is NULL and moves
isel assignment after imsic_state NULL check.

Fixes: 5463091a51cfaa ("RISC-V: KVM: Expose IMSIC registers as attributes of AIA irqchip")
Signed-off-by: Jiakai Xu <xujiakai2025@iscas.ac.cn>
Signed-off-by: Jiakai Xu <jiakaiPeanut@gmail.com>
Reviewed-by: Anup Patel <anup@brainfault.org>
Link: https://lore.kernel.org/r/20260127072219.3366607-1-xujiakai2025@iscas.ac.cn
Signed-off-by: Anup Patel <anup@brainfault.org>
arch/riscv/kvm/aia_imsic.c

index cd070d83663a9d03eeff6573d44757fd6ec5de69..7edfd129242ff399fb506493ae4d208732f3ca51 100644 (file)
@@ -952,8 +952,10 @@ int kvm_riscv_aia_imsic_rw_attr(struct kvm *kvm, unsigned long type,
        if (!vcpu)
                return -ENODEV;
 
-       isel = KVM_DEV_RISCV_AIA_IMSIC_GET_ISEL(type);
        imsic = vcpu->arch.aia_context.imsic_state;
+       if (!imsic)
+               return -ENODEV;
+       isel = KVM_DEV_RISCV_AIA_IMSIC_GET_ISEL(type);
 
        read_lock_irqsave(&imsic->vsfile_lock, flags);