2022-11-08 06:41:59 +00:00
|
|
|
From 2db3d0de1be018f14cb91fdd4a368996b09d8bec Mon Sep 17 00:00:00 2001
|
2022-08-02 07:09:31 +00:00
|
|
|
From: Jon Maloy <jmaloy@redhat.com>
|
|
|
|
|
Date: Wed, 13 Apr 2022 14:51:06 -0400
|
2022-11-08 06:41:59 +00:00
|
|
|
Subject: [PATCH 1/3] hw/intc/arm_gicv3: Check for !MEMTX_OK instead of
|
2022-08-02 07:09:31 +00:00
|
|
|
MEMTX_ERROR
|
|
|
|
|
MIME-Version: 1.0
|
|
|
|
|
Content-Type: text/plain; charset=UTF-8
|
|
|
|
|
Content-Transfer-Encoding: 8bit
|
|
|
|
|
|
|
|
|
|
RH-Author: Jon Maloy <jmaloy@redhat.com>
|
2022-11-08 06:41:59 +00:00
|
|
|
RH-MergeRequest: 151: hw/intc/arm_gicv3: Check for !MEMTX_OK instead of MEMTX_ERROR
|
|
|
|
|
RH-Commit: [1/3] 561c9c2b1249f07d33013040b1c495ed1fbf825b (jmaloy/qemu-kvm)
|
|
|
|
|
RH-Bugzilla: 1999236
|
2022-08-02 07:09:31 +00:00
|
|
|
RH-Acked-by: Stefan Hajnoczi <stefanha@redhat.com>
|
|
|
|
|
RH-Acked-by: Peter Xu <peterx@redhat.com>
|
|
|
|
|
|
2022-11-08 06:41:59 +00:00
|
|
|
Bugzilla: https://bugzilla.redhat.com/show_bug.cgi?id=1999236
|
2022-08-02 07:09:31 +00:00
|
|
|
Upstream: Merged
|
|
|
|
|
CVE: CVE-2021-3750
|
|
|
|
|
|
|
|
|
|
commit b9d383ab797f54ae5fa8746117770709921dc529
|
|
|
|
|
Author: Philippe Mathieu-Daudé <philmd@redhat.com>
|
|
|
|
|
Date: Wed Dec 15 19:24:19 2021 +0100
|
|
|
|
|
|
|
|
|
|
hw/intc/arm_gicv3: Check for !MEMTX_OK instead of MEMTX_ERROR
|
|
|
|
|
|
|
|
|
|
Quoting Peter Maydell:
|
|
|
|
|
|
|
|
|
|
"These MEMTX_* aren't from the memory transaction
|
|
|
|
|
API functions; they're just being used by gicd_readl() and
|
|
|
|
|
friends as a way to indicate a success/failure so that the
|
|
|
|
|
actual MemoryRegionOps read/write fns like gicv3_dist_read()
|
|
|
|
|
can log a guest error."
|
|
|
|
|
|
|
|
|
|
We are going to introduce more MemTxResult bits, so it is
|
|
|
|
|
safer to check for !MEMTX_OK rather than MEMTX_ERROR.
|
|
|
|
|
|
|
|
|
|
Reviewed-by: Peter Xu <peterx@redhat.com>
|
|
|
|
|
Reviewed-by: David Hildenbrand <david@redhat.com>
|
|
|
|
|
Reviewed-by: Peter Maydell <peter.maydell@linaro.org>
|
|
|
|
|
Reviewed-by: Stefan Hajnoczi <stefanha@redhat.com>
|
|
|
|
|
Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>
|
|
|
|
|
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
|
|
|
|
|
|
|
|
|
|
(cherry picked from commit b9d383ab797f54ae5fa8746117770709921dc529)
|
|
|
|
|
Signed-off-by: Jon Maloy <jmaloy@redhat.com>
|
|
|
|
|
---
|
|
|
|
|
hw/intc/arm_gicv3_redist.c | 4 ++--
|
|
|
|
|
1 file changed, 2 insertions(+), 2 deletions(-)
|
|
|
|
|
|
|
|
|
|
diff --git a/hw/intc/arm_gicv3_redist.c b/hw/intc/arm_gicv3_redist.c
|
|
|
|
|
index c8ff3eca08..99b11ca5ee 100644
|
|
|
|
|
--- a/hw/intc/arm_gicv3_redist.c
|
|
|
|
|
+++ b/hw/intc/arm_gicv3_redist.c
|
|
|
|
|
@@ -462,7 +462,7 @@ MemTxResult gicv3_redist_read(void *opaque, hwaddr offset, uint64_t *data,
|
|
|
|
|
break;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
- if (r == MEMTX_ERROR) {
|
|
|
|
|
+ if (r != MEMTX_OK) {
|
|
|
|
|
qemu_log_mask(LOG_GUEST_ERROR,
|
|
|
|
|
"%s: invalid guest read at offset " TARGET_FMT_plx
|
|
|
|
|
" size %u\n", __func__, offset, size);
|
|
|
|
|
@@ -521,7 +521,7 @@ MemTxResult gicv3_redist_write(void *opaque, hwaddr offset, uint64_t data,
|
|
|
|
|
break;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
- if (r == MEMTX_ERROR) {
|
|
|
|
|
+ if (r != MEMTX_OK) {
|
|
|
|
|
qemu_log_mask(LOG_GUEST_ERROR,
|
|
|
|
|
"%s: invalid guest write at offset " TARGET_FMT_plx
|
|
|
|
|
" size %u\n", __func__, offset, size);
|
|
|
|
|
--
|
|
|
|
|
2.27.0
|
|
|
|
|
|
