From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:58266) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1c2EJN-0003aF-5A for qemu-devel@nongnu.org; Thu, 03 Nov 2016 05:27:53 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1c2EJK-0001jZ-1u for qemu-devel@nongnu.org; Thu, 03 Nov 2016 05:27:53 -0400 Received: from mx1.redhat.com ([209.132.183.28]:39860) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1c2EJJ-0001j3-U4 for qemu-devel@nongnu.org; Thu, 03 Nov 2016 05:27:50 -0400 From: Jason Wang Date: Thu, 3 Nov 2016 17:27:16 +0800 Message-Id: <1478165243-4767-5-git-send-email-jasowang@redhat.com> In-Reply-To: <1478165243-4767-1-git-send-email-jasowang@redhat.com> References: <1478165243-4767-1-git-send-email-jasowang@redhat.com> Subject: [Qemu-devel] [PATCH V2 04/11] intel_iommu: allocate new key when creating new address space List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: mst@redhat.com, peterx@redhat.com, wexu@redhat.com, qemu-devel@nongnu.org Cc: vkaplans@redhat.com, pbonzini@redhat.com, cornelia.huck@de.ibm.com, Jason Wang , Richard Henderson , Eduardo Habkost We use the pointer to stack for key for new address space, this will break hash table searching, fixing by g_malloc() a new key instead. Cc: Michael S. Tsirkin Cc: Paolo Bonzini Cc: Richard Henderson Cc: Eduardo Habkost Acked-by: Peter Xu Signed-off-by: Jason Wang --- hw/i386/intel_iommu.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/hw/i386/intel_iommu.c b/hw/i386/intel_iommu.c index 833c7a6..eb57cbf 100644 --- a/hw/i386/intel_iommu.c +++ b/hw/i386/intel_iommu.c @@ -2326,12 +2326,13 @@ VTDAddressSpace *vtd_find_add_as(IntelIOMMUState *s, PCIBus *bus, int devfn) char name[128]; if (!vtd_bus) { + uintptr_t *new_key = g_malloc(sizeof(*new_key)); + *new_key = (uintptr_t)bus; /* No corresponding free() */ vtd_bus = g_malloc0(sizeof(VTDBus) + sizeof(VTDAddressSpace *) * \ X86_IOMMU_PCI_DEVFN_MAX); vtd_bus->bus = bus; - key = (uintptr_t)bus; - g_hash_table_insert(s->vtd_as_by_busptr, &key, vtd_bus); + g_hash_table_insert(s->vtd_as_by_busptr, new_key, vtd_bus); } vtd_dev_as = vtd_bus->dev_as[devfn]; -- 2.7.4