Skip to content
  • Philippe Mathieu-Daudé's avatar
    edfe2eb4
    hw/intc/arm_gic: Fix interrupt ID in GICD_SGIR register · edfe2eb4
    Philippe Mathieu-Daudé authored
    Per the ARM Generic Interrupt Controller Architecture specification
    (document "ARM IHI 0048B.b (ID072613)"), the SGIINTID field is 4 bit,
    not 10:
    
      - 4.3 Distributor register descriptions
      - 4.3.15 Software Generated Interrupt Register, GICD_SG
    
        - Table 4-21 GICD_SGIR bit assignments
    
        The Interrupt ID of the SGI to forward to the specified CPU
        interfaces. The value of this field is the Interrupt ID, in
        the range 0-15, for example a value of 0b0011 specifies
        Interrupt ID 3.
    
    Correct the irq mask to fix an undefined behavior (which eventually
    lead to a heap-buffer-overflow, see [Buglink]):
    
       $ echo 'writel 0x8000f00 0xff4affb0' | qemu-system-aarch64 -M virt,accel=qtest -qtest stdio
       [I 1612088147.116987] OPENED
      [R +0.278293] writel 0x8000f00 0xff4affb0
      ../hw/intc/arm_gic.c:1498:13: runtime error: index 944 out of bounds for type 'uint8_t [16][8]'
      SUMMARY: UndefinedBehaviorSanitizer: undefined-behavior ../hw/intc/arm_gic.c:1498:13
    
    This fixes a security issue when running with KVM on Arm with
    kernel-irqchip=off. (The default is kernel-irqchip=on, which is
    unaffected, and which is also the correct choice for performance.)
    
    Cc: qemu-stable@nongnu.org
    Fixes: CVE-2021-20221
    Fixes: 9ee6e8bb ("ARMv7 support.")
    Buglink: https://bugs.launchpad.net/qemu/+bug/1913916
    Buglink: https://bugs.launchpad.net/qemu/+bug/1913917
    
    
    Reported-by: default avatarAlexander Bulekov <alxndr@bu.edu>
    Signed-off-by: default avatarPhilippe Mathieu-Daudé <f4bug@amsat.org>
    Message-id: 20210131103401.217160-1-f4bug@amsat.org
    Reviewed-by: default avatarPeter Maydell <peter.maydell@linaro.org>
    Signed-off-by: default avatarPeter Maydell <peter.maydell@linaro.org>
    edfe2eb4
    hw/intc/arm_gic: Fix interrupt ID in GICD_SGIR register
    Philippe Mathieu-Daudé authored
    Per the ARM Generic Interrupt Controller Architecture specification
    (document "ARM IHI 0048B.b (ID072613)"), the SGIINTID field is 4 bit,
    not 10:
    
      - 4.3 Distributor register descriptions
      - 4.3.15 Software Generated Interrupt Register, GICD_SG
    
        - Table 4-21 GICD_SGIR bit assignments
    
        The Interrupt ID of the SGI to forward to the specified CPU
        interfaces. The value of this field is the Interrupt ID, in
        the range 0-15, for example a value of 0b0011 specifies
        Interrupt ID 3.
    
    Correct the irq mask to fix an undefined behavior (which eventually
    lead to a heap-buffer-overflow, see [Buglink]):
    
       $ echo 'writel 0x8000f00 0xff4affb0' | qemu-system-aarch64 -M virt,accel=qtest -qtest stdio
       [I 1612088147.116987] OPENED
      [R +0.278293] writel 0x8000f00 0xff4affb0
      ../hw/intc/arm_gic.c:1498:13: runtime error: index 944 out of bounds for type 'uint8_t [16][8]'
      SUMMARY: UndefinedBehaviorSanitizer: undefined-behavior ../hw/intc/arm_gic.c:1498:13
    
    This fixes a security issue when running with KVM on Arm with
    kernel-irqchip=off. (The default is kernel-irqchip=on, which is
    unaffected, and which is also the correct choice for performance.)
    
    Cc: qemu-stable@nongnu.org
    Fixes: CVE-2021-20221
    Fixes: 9ee6e8bb ("ARMv7 support.")
    Buglink: https://bugs.launchpad.net/qemu/+bug/1913916
    Buglink: https://bugs.launchpad.net/qemu/+bug/1913917
    
    
    Reported-by: default avatarAlexander Bulekov <alxndr@bu.edu>
    Signed-off-by: default avatarPhilippe Mathieu-Daudé <f4bug@amsat.org>
    Message-id: 20210131103401.217160-1-f4bug@amsat.org
    Reviewed-by: default avatarPeter Maydell <peter.maydell@linaro.org>
    Signed-off-by: default avatarPeter Maydell <peter.maydell@linaro.org>
Loading