x86, AMD IOMMU: initialize dma_ops after sysfs registration
If sysfs registration fails all memory used by IOMMU is freed. This
happens after dma_ops initialization and the functions will access the
freed memory then.
Fix this by initializing dma_ops after the sysfs registration.
Signed-off-by: Joerg Roedel <joerg.roedel@amd.com>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
diff --git a/arch/x86/kernel/amd_iommu_init.c b/arch/x86/kernel/amd_iommu_init.c
index ceba338..a69cc0f 100644
--- a/arch/x86/kernel/amd_iommu_init.c
+++ b/arch/x86/kernel/amd_iommu_init.c
@@ -972,10 +972,6 @@
if (acpi_table_parse("IVRS", init_memory_definitions) != 0)
goto free;
- ret = amd_iommu_init_dma_ops();
- if (ret)
- goto free;
-
ret = sysdev_class_register(&amd_iommu_sysdev_class);
if (ret)
goto free;
@@ -984,6 +980,10 @@
if (ret)
goto free;
+ ret = amd_iommu_init_dma_ops();
+ if (ret)
+ goto free;
+
enable_iommus();
printk(KERN_INFO "AMD IOMMU: aperture size is %d MB\n",