From: Cédric Le Goater Date: Fri, 15 Nov 2024 08:34:40 +0000 (+0100) Subject: vfio/container: Fix container object destruction X-Git-Tag: v9.1.2~5 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=019d93004bc0b65185ec7887b9b848d0849609fe;p=thirdparty%2Fqemu.git vfio/container: Fix container object destruction When commit 96b7af4388b3 intoduced a .instance_finalize() handler, it did not take into account that the container was not necessarily inserted into the container list of the address space. Hence, if the container object is destroyed, by calling object_unref() for example, before vfio_address_space_insert() is called, QEMU may crash when removing the container from the list as done in vfio_container_instance_finalize(). This was seen with an SEV-SNP guest for which discarding of RAM fails. To resolve this issue, use the safe version of QLIST_REMOVE(). Cc: Zhenzhong Duan Cc: Eric Auger Fixes: 96b7af4388b3 ("vfio/container: Move vfio_container_destroy() to an instance_finalize() handler") Reviewed-by: Zhenzhong Duan Signed-off-by: Cédric Le Goater (cherry picked from commit ebbf7c60bbd1ceedf9faf962e428ceda2388c248) Signed-off-by: Michael Tokarev --- diff --git a/hw/vfio/container-base.c b/hw/vfio/container-base.c index 809b1576742..6f86c37d971 100644 --- a/hw/vfio/container-base.c +++ b/hw/vfio/container-base.c @@ -103,7 +103,7 @@ static void vfio_container_instance_finalize(Object *obj) VFIOContainerBase *bcontainer = VFIO_IOMMU(obj); VFIOGuestIOMMU *giommu, *tmp; - QLIST_REMOVE(bcontainer, next); + QLIST_SAFE_REMOVE(bcontainer, next); QLIST_FOREACH_SAFE(giommu, &bcontainer->giommu_list, giommu_next, tmp) { memory_region_unregister_iommu_notifier(