3fc6a966db
hw/intc/arm_gicv3_dist: Rename 64-bit accessors with 'q' suffix hw/intc/arm_gicv3: Replace mis-used MEMTX_* constants by booleans hw/intc/arm_gicv3: Check for !MEMTX_OK instead of MEMTX_ERROR (CVE-2021-3750) net/colo-compare.c: Check that colo-compare is active
56 lines
2.0 KiB
Diff
56 lines
2.0 KiB
Diff
From 0bf2096f7967af3c28280c72803f25c7c226d218 Mon Sep 17 00:00:00 2001
|
|
From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= <philmd@redhat.com>
|
|
Date: Wed, 15 Dec 2021 19:24:19 +0100
|
|
Subject: [PATCH 3/4] hw/intc/arm_gicv3: Check for !MEMTX_OK instead of
|
|
MEMTX_ERROR
|
|
MIME-Version: 1.0
|
|
Content-Type: text/plain; charset=UTF-8
|
|
Content-Transfer-Encoding: 8bit
|
|
|
|
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>
|
|
---
|
|
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 8645220d61..44368e285a 100644
|
|
--- a/hw/intc/arm_gicv3_redist.c
|
|
+++ b/hw/intc/arm_gicv3_redist.c
|
|
@@ -450,7 +450,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);
|
|
@@ -507,7 +507,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
|
|
|