81 lines
3.0 KiB
Diff
81 lines
3.0 KiB
Diff
From dad4f9beaa3fd1eec1e0dd46c3d5cd2f444c0f48 Mon Sep 17 00:00:00 2001
|
|
From: Jon Maloy <jmaloy@redhat.com>
|
|
Date: Tue, 13 Apr 2021 20:05:51 -0400
|
|
Subject: [PATCH 1/7] hw/intc/arm_gic: Fix interrupt ID in GICD_SGIR register
|
|
MIME-Version: 1.0
|
|
Content-Type: text/plain; charset=UTF-8
|
|
Content-Transfer-Encoding: 8bit
|
|
|
|
RH-Author: Jon Maloy <jmaloy@redhat.com>
|
|
Message-id: <20210413200551.3825495-2-jmaloy@redhat.com>
|
|
Patchwork-id: 101471
|
|
O-Subject: [RHEL-8.5.0 qemu-kvm PATCH 1/1] hw/intc/arm_gic: Fix interrupt ID in GICD_SGIR register
|
|
Bugzilla: 1925430
|
|
RH-Acked-by: Andrew Jones <drjones@redhat.com>
|
|
RH-Acked-by: Stefan Hajnoczi <stefanha@redhat.com>
|
|
RH-Acked-by: Philippe Mathieu-Daudé <philmd@redhat.com>
|
|
|
|
From: Philippe Mathieu-Daudé <f4bug@amsat.org>
|
|
|
|
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: 9ee6e8bb853 ("ARMv7 support.")
|
|
Buglink: https://bugs.launchpad.net/qemu/+bug/1913916
|
|
Buglink: https://bugs.launchpad.net/qemu/+bug/1913917
|
|
Reported-by: Alexander Bulekov <alxndr@bu.edu>
|
|
Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
|
|
Message-id: 20210131103401.217160-1-f4bug@amsat.org
|
|
Reviewed-by: Peter Maydell <peter.maydell@linaro.org>
|
|
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
|
|
|
|
(cherry picked from commit edfe2eb4360cde4ed5d95bda7777edcb3510f76a)
|
|
Signed-off-by: Jon Maloy <jmaloy@redhat.com>
|
|
Signed-off-by: Danilo C. L. de Paula <ddepaula@redhat.com>
|
|
---
|
|
hw/intc/arm_gic.c | 2 +-
|
|
1 file changed, 1 insertion(+), 1 deletion(-)
|
|
|
|
diff --git a/hw/intc/arm_gic.c b/hw/intc/arm_gic.c
|
|
index 1d7da7baa2..df355f4d11 100644
|
|
--- a/hw/intc/arm_gic.c
|
|
+++ b/hw/intc/arm_gic.c
|
|
@@ -1455,7 +1455,7 @@ static void gic_dist_writel(void *opaque, hwaddr offset,
|
|
int target_cpu;
|
|
|
|
cpu = gic_get_current_cpu(s);
|
|
- irq = value & 0x3ff;
|
|
+ irq = value & 0xf;
|
|
switch ((value >> 24) & 3) {
|
|
case 0:
|
|
mask = (value >> 16) & ALL_CPU_MASK;
|
|
--
|
|
2.27.0
|
|
|