]> xenbits.xensource.com Git - people/andrewcoop/xen.git/commitdiff
ARM/vgic: Fix out-of-bounds accesses in vgic_mmio_write_sgir()
authorAndrew Cooper <andrew.cooper3@citrix.com>
Wed, 2 Apr 2025 12:31:17 +0000 (14:31 +0200)
committerJan Beulich <jbeulich@suse.com>
Wed, 2 Apr 2025 12:31:17 +0000 (14:31 +0200)
The switch() statement is over bits 24:25 (unshifted) of the guest provided
value.  This makes case 0x3: dead, and not an implementation of the 4th
possible state.

A guest which writes (0x3 << 24) | (0xff << 16) to this register will skip the
early exit, then enter bitmap_for_each() with targets not bound by nr_vcpus.

If the guest has fewer than 8 vCPUs, bitmap_for_each() will read off the end
of d->vcpu[] and use the resulting vcpu pointer to ultimately derive irq, and
perform out-of-bounds writes.

Fix this by changing case 0x3 to default.

Fixes: 08c688ca6422 ("ARM: new VGIC: Add SGIR register handler")
Signed-off-by: Andrew Cooper <andrew.cooper3@citrix.com>
Reviewed-by: Volodymyr Babchuk <volodymyr_babchuk@epam.com>
Reviewed-by: Stefano Stabellini <sstabellini@kernel.org>
master commit: be7f0cc651d8d02a95820792204c0558f1f29e03
master date: 2025-03-27 11:54:23 +0000

xen/arch/arm/vgic/vgic-mmio-v2.c

index 2e507b10fed572fd1aac60bbd9c19bde7fc6a2f4..e14de567a7217274d34b4b25f01af3f79d19071b 100644 (file)
@@ -104,7 +104,8 @@ static void vgic_mmio_write_sgir(struct vcpu *source_vcpu,
     case GICD_SGI_TARGET_SELF:                    /* this very vCPU only */
         targets = (1U << source_vcpu->vcpu_id);
         break;
-    case 0x3:                                     /* reserved */
+
+    default:
         return;
     }