From: Edgar E. Iglesias <edgar.iglesias@amd.com>
Date: Mon, 1 Jul 2024 22:44:20 +0000 (+0200)
Subject: physmem: Bail out qemu_ram_block_from_host() for invalid ram addrs
X-Git-Tag: v9.1.0-rc0~34^2~1
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=596ccccdbfa124adb42be8c2faf0c74f4849c7a6;p=thirdparty%2Fqemu.git

physmem: Bail out qemu_ram_block_from_host() for invalid ram addrs

Bail out in qemu_ram_block_from_host() when
xen_ram_addr_from_mapcache() does not find an existing
mapping.

Signed-off-by: Edgar E. Iglesias <edgar.iglesias@amd.com>
Reviewed-by: Alex Bennée <alex.bennee@linaro.org>
Reviewed-by: Stefano Stabellini <sstabellini@kernel.org>
---

diff --git a/system/physmem.c b/system/physmem.c
index 14aa025d410..2154432cb6a 100644
--- a/system/physmem.c
+++ b/system/physmem.c
@@ -2277,6 +2277,10 @@ RAMBlock *qemu_ram_block_from_host(void *ptr, bool round_offset,
         ram_addr_t ram_addr;
         RCU_READ_LOCK_GUARD();
         ram_addr = xen_ram_addr_from_mapcache(ptr);
+        if (ram_addr == RAM_ADDR_INVALID) {
+            return NULL;
+        }
+
         block = qemu_get_ram_block(ram_addr);
         if (block) {
             *offset = ram_addr - block->offset;