Skip to contentSkip to conversation

x86/pci: fix dmar_tbl early_ioremap leak

PATCH In review Yinghai Lu 2 participants 2 messages Sep 25, 2008 PCI

lore
Share & tools
lore

Yinghai Lu

author
#0 lore raw

PATCH 1/1 x86/pci: fix dmar_tbl early_ioremap leak

use early_acpi_os_unmap_memory

---
 drivers/pci/dmar.c |    9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)
drivers/pci/dmar.c +7 -2
Index: linux-2.6/drivers/pci/dmar.c
===================================================================
@@ -42,6 +42,7 @@
 LIST_HEAD(dmar_drhd_units);
 
 static struct acpi_table_header * __initdata dmar_tbl;
+static acpi_size __initdata dmar_tbl_size;
 
 static void __init dmar_register_drhd_unit(struct dmar_drhd_unit *drhd)
 {
@@ -296,9 +297,13 @@ static int __init dmar_table_detect(void
 {
 	acpi_status status = AE_OK;
 
+	if (dmar_tbl)
+		early_acpi_os_unmap_memory(dmar_tbl, dmar_tbl_size);
+
 	/* if we could find DMAR table, then there are DMAR devices */
-	status = acpi_get_table(ACPI_SIG_DMAR, 0,
-				(struct acpi_table_header **)&dmar_tbl);
+	status = acpi_get_table_with_size(ACPI_SIG_DMAR, 0,
+				(struct acpi_table_header **)&dmar_tbl,
+				&dmar_tbl_size);
 
 	if (ACPI_SUCCESS(status) && !dmar_tbl) {
 		printk (KERN_WARNING PREFIX "Unable to map DMAR\n");
#1 lore raw
Quoted 21 lines · Yinghai Lu

use early_acpi_os_unmap_memory

---
 drivers/pci/dmar.c |    9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

Index: linux-2.6/drivers/pci/dmar.c
===================================================================

drivers/pci/dmar.c +1 -0
@@ -42,6 +42,7 @@
 LIST_HEAD(dmar_drhd_units);
 
 static struct acpi_table_header * __initdata dmar_tbl;
+static acpi_size __initdata dmar_tbl_size;
 
 static void __init dmar_register_drhd_unit(struct dmar_drhd_unit *drhd)
 {

drivers/pci/dmar.c static int __init dmar_table_detect(void · line 302

Quoted 6 lines
drivers/pci/dmar.c +3 -0
@@ -296,9 +297,13 @@ static int __init dmar_table_detect(void
 {
       acpi_status status = AE_OK;
 
+       if (dmar_tbl)
+               early_acpi_os_unmap_memory(dmar_tbl, dmar_tbl_size);
+

need more work..

YH