From a8749d7cc9210ae76bb7032970ad8a208c67a1f2 Mon Sep 17 00:00:00 2001 From: David Hildenbrand Date: Tue, 1 Feb 2022 11:09:40 +0100 Subject: memory: Make memory_region_readd_subregion() properly handle mapped aliases MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit memory_region_readd_subregion() wants to readd a region by first removing it and then readding it. For readding, it doesn't use one of the memory_region_add_*() variants, which is why fail to re-increment the mr->mapped_via_alias counters, resulting in the assert(alias->mapped_via_alias >= 0) in memory_region_del_subregion() triggering the next time we call memory_region_readd_subregion(). Fix it by using memory_region_add_subregion_common() for readding the region. Reported-by: Niek Linnenbank Fixes: 5ead62185d23 ("memory: Make memory_region_is_mapped() succeed when mapped via an alias") Tested-by: Niek Linnenbank Cc: Paolo Bonzini Cc: Peter Xu Cc: "Philippe Mathieu-Daudé" Signed-off-by: David Hildenbrand Message-Id: <20220201100940.47788-1-david@redhat.com> Signed-off-by: Philippe Mathieu-Daudé --- softmmu/memory.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'softmmu/memory.c') diff --git a/softmmu/memory.c b/softmmu/memory.c index 8060c6de78..bfa5d5178c 100644 --- a/softmmu/memory.c +++ b/softmmu/memory.c @@ -2626,8 +2626,7 @@ static void memory_region_readd_subregion(MemoryRegion *mr) memory_region_transaction_begin(); memory_region_ref(mr); memory_region_del_subregion(container, mr); - mr->container = container; - memory_region_update_container_subregions(mr); + memory_region_add_subregion_common(container, mr->addr, mr); memory_region_unref(mr); memory_region_transaction_commit(); } -- cgit v1.2.3