|
 |
6e7d01 |
From be0a190e3c5c4ff84f7c53630ed5a55644d18acc Mon Sep 17 00:00:00 2001
|
|
|
6e7d01 |
From: Jon Maloy <jmaloy@redhat.com>
|
|
|
6e7d01 |
Date: Wed, 21 Apr 2021 22:30:06 -0400
|
|
|
6e7d01 |
Subject: [PATCH 7/7] softmmu/memory: Log invalid memory accesses
|
|
|
6e7d01 |
MIME-Version: 1.0
|
|
|
6e7d01 |
Content-Type: text/plain; charset=UTF-8
|
|
|
6e7d01 |
Content-Transfer-Encoding: 8bit
|
|
|
6e7d01 |
|
|
|
6e7d01 |
RH-Author: Jon Maloy <jmaloy@redhat.com>
|
|
|
6e7d01 |
Message-id: <20210421223006.19650-7-jmaloy@redhat.com>
|
|
|
6e7d01 |
Patchwork-id: 101481
|
|
|
6e7d01 |
O-Subject: [RHEL-8.5.0 qemu-kvm PATCH v2 6/6] softmmu/memory: Log invalid memory accesses
|
|
|
6e7d01 |
Bugzilla: 1842478
|
|
|
6e7d01 |
RH-Acked-by: Stefano Garzarella <sgarzare@redhat.com>
|
|
|
6e7d01 |
RH-Acked-by: Philippe Mathieu-Daudé <philmd@redhat.com>
|
|
|
6e7d01 |
RH-Acked-by: Laszlo Ersek <lersek@redhat.com>
|
|
|
6e7d01 |
|
|
|
6e7d01 |
From: Philippe Mathieu-Daudé <philmd@redhat.com>
|
|
|
6e7d01 |
|
|
|
6e7d01 |
Log invalid memory accesses with as GUEST_ERROR.
|
|
|
6e7d01 |
|
|
|
6e7d01 |
This is particularly useful since commit 5d971f9e67 which reverted
|
|
|
6e7d01 |
("memory: accept mismatching sizes in memory_region_access_valid").
|
|
|
6e7d01 |
|
|
|
6e7d01 |
Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>
|
|
|
6e7d01 |
Reviewed-by: Michael S. Tsirkin <mst@redhat.com>
|
|
|
6e7d01 |
Message-Id: <20201005152725.2143444-1-philmd@redhat.com>
|
|
|
6e7d01 |
Signed-off-by: Laurent Vivier <laurent@vivier.eu>
|
|
|
6e7d01 |
|
|
|
6e7d01 |
(cherry picked from commit 21786c7e59847b1612406ff394958f22e5b323f8)
|
|
|
6e7d01 |
Signed-off-by: Jon Maloy <jmaloy@redhat.com>
|
|
|
6e7d01 |
Signed-off-by: Danilo C. L. de Paula <ddepaula@redhat.com>
|
|
|
6e7d01 |
---
|
|
|
6e7d01 |
memory.c | 16 ++++++++++++++++
|
|
|
6e7d01 |
1 file changed, 16 insertions(+)
|
|
|
6e7d01 |
|
|
|
6e7d01 |
diff --git a/memory.c b/memory.c
|
|
|
6e7d01 |
index 0cfcb72a5a..660df8159a 100644
|
|
|
6e7d01 |
--- a/memory.c
|
|
|
6e7d01 |
+++ b/memory.c
|
|
|
6e7d01 |
@@ -14,6 +14,7 @@
|
|
|
6e7d01 |
*/
|
|
|
6e7d01 |
|
|
|
6e7d01 |
#include "qemu/osdep.h"
|
|
|
6e7d01 |
+#include "qemu/log.h"
|
|
|
6e7d01 |
#include "qapi/error.h"
|
|
|
6e7d01 |
#include "cpu.h"
|
|
|
6e7d01 |
#include "exec/memory.h"
|
|
|
6e7d01 |
@@ -1353,10 +1354,18 @@ bool memory_region_access_valid(MemoryRegion *mr,
|
|
|
6e7d01 |
{
|
|
|
6e7d01 |
if (mr->ops->valid.accepts
|
|
|
6e7d01 |
&& !mr->ops->valid.accepts(mr->opaque, addr, size, is_write, attrs)) {
|
|
|
6e7d01 |
+ qemu_log_mask(LOG_GUEST_ERROR, "Invalid access at addr "
|
|
|
6e7d01 |
+ "0x%" HWADDR_PRIX ", size %u, "
|
|
|
6e7d01 |
+ "region '%s', reason: rejected\n",
|
|
|
6e7d01 |
+ addr, size, memory_region_name(mr));
|
|
|
6e7d01 |
return false;
|
|
|
6e7d01 |
}
|
|
|
6e7d01 |
|
|
|
6e7d01 |
if (!mr->ops->valid.unaligned && (addr & (size - 1))) {
|
|
|
6e7d01 |
+ qemu_log_mask(LOG_GUEST_ERROR, "Invalid access at addr "
|
|
|
6e7d01 |
+ "0x%" HWADDR_PRIX ", size %u, "
|
|
|
6e7d01 |
+ "region '%s', reason: unaligned\n",
|
|
|
6e7d01 |
+ addr, size, memory_region_name(mr));
|
|
|
6e7d01 |
return false;
|
|
|
6e7d01 |
}
|
|
|
6e7d01 |
|
|
|
6e7d01 |
@@ -1367,6 +1376,13 @@ bool memory_region_access_valid(MemoryRegion *mr,
|
|
|
6e7d01 |
|
|
|
6e7d01 |
if (size > mr->ops->valid.max_access_size
|
|
|
6e7d01 |
|| size < mr->ops->valid.min_access_size) {
|
|
|
6e7d01 |
+ qemu_log_mask(LOG_GUEST_ERROR, "Invalid access at addr "
|
|
|
6e7d01 |
+ "0x%" HWADDR_PRIX ", size %u, "
|
|
|
6e7d01 |
+ "region '%s', reason: invalid size "
|
|
|
6e7d01 |
+ "(min:%u max:%u)\n",
|
|
|
6e7d01 |
+ addr, size, memory_region_name(mr),
|
|
|
6e7d01 |
+ mr->ops->valid.min_access_size,
|
|
|
6e7d01 |
+ mr->ops->valid.max_access_size);
|
|
|
6e7d01 |
return false;
|
|
|
6e7d01 |
}
|
|
|
6e7d01 |
return true;
|
|
|
6e7d01 |
--
|
|
|
6e7d01 |
2.27.0
|
|
|
6e7d01 |
|