Skip to content

Commit

Permalink
x86/amd-iommu: Fix initialization failure panic
Browse files Browse the repository at this point in the history
The assumption that acpi_table_parse passes the return value
of the hanlder function to the caller proved wrong
recently. The return value of the handler function is
totally ignored. This makes the initialization code for AMD
IOMMU buggy in a way that could cause a kernel panic on
initialization. This patch fixes the issue in the AMD IOMMU
driver.

Cc: stable@kernel.org
Signed-off-by: Joerg Roedel <joerg.roedel@amd.com>
  • Loading branch information
Joerg Roedel committed Dec 21, 2009
1 parent 5563935 commit 0f76480
Showing 1 changed file with 10 additions and 0 deletions.
10 changes: 10 additions & 0 deletions arch/x86/kernel/amd_iommu_init.c
Original file line number Diff line number Diff line change
Expand Up @@ -137,6 +137,11 @@ int amd_iommus_present;
/* IOMMUs have a non-present cache? */
bool amd_iommu_np_cache __read_mostly;

/*
* Set to true if ACPI table parsing and hardware intialization went properly
*/
static bool amd_iommu_initialized;

/*
* List of protection domains - used during resume
*/
Expand Down Expand Up @@ -929,6 +934,8 @@ static int __init init_iommu_all(struct acpi_table_header *table)
}
WARN_ON(p != end);

amd_iommu_initialized = true;

return 0;
}

Expand Down Expand Up @@ -1263,6 +1270,9 @@ static int __init amd_iommu_init(void)
if (acpi_table_parse("IVRS", init_iommu_all) != 0)
goto free;

if (!amd_iommu_initialized)
goto free;

if (acpi_table_parse("IVRS", init_memory_definitions) != 0)
goto free;

Expand Down

0 comments on commit 0f76480

Please sign in to comment.