[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 06/41] intel_iommu: allocate new key when creating ne
From: |
Michael S. Tsirkin |
Subject: |
[Qemu-devel] [PULL 06/41] intel_iommu: allocate new key when creating new address space |
Date: |
Tue, 10 Jan 2017 07:39:35 +0200 |
From: Jason Wang <address@hidden>
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 <address@hidden>
Cc: Paolo Bonzini <address@hidden>
Cc: Richard Henderson <address@hidden>
Cc: Eduardo Habkost <address@hidden>
Acked-by: Peter Xu <address@hidden>
Signed-off-by: Jason Wang <address@hidden>
Reviewed-by: Michael S. Tsirkin <address@hidden>
Signed-off-by: Michael S. Tsirkin <address@hidden>
---
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 0dd1c8f..e39b764 100644
--- a/hw/i386/intel_iommu.c
+++ b/hw/i386/intel_iommu.c
@@ -2347,12 +2347,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];
--
MST
- [Qemu-devel] [PULL 00/41] virtio, vhost, pc: fixes, features, Michael S. Tsirkin, 2017/01/10
- [Qemu-devel] [PULL 01/41] migration: allow to prioritize save state entries, Michael S. Tsirkin, 2017/01/10
- [Qemu-devel] [PULL 02/41] intel_iommu: allow migration, Michael S. Tsirkin, 2017/01/10
- [Qemu-devel] [PULL 03/41] virtio-crypto: fix possible integer and heap overflow, Michael S. Tsirkin, 2017/01/10
- [Qemu-devel] [PULL 05/41] intel_iommu: name vtd address space with devfn, Michael S. Tsirkin, 2017/01/10
- [Qemu-devel] [PULL 06/41] intel_iommu: allocate new key when creating new address space,
Michael S. Tsirkin <=
- [Qemu-devel] [PULL 04/41] virtio: convert to use DMA api, Michael S. Tsirkin, 2017/01/10
- [Qemu-devel] [PULL 07/41] exec: introduce address_space_get_iotlb_entry(), Michael S. Tsirkin, 2017/01/10
- [Qemu-devel] [PULL 08/41] intel_iommu: support device iotlb descriptor, Michael S. Tsirkin, 2017/01/10