Commit 3ddbe913 authored Jun 12, 2019 by Kevin Mitchell Committed by Joerg Roedel Jul 01, 2019

iommu/amd: Make iommu_disable safer



Make it safe to call iommu_disable during early init error conditions
before mmio_base is set, but after the struct amd_iommu has been added
to the amd_iommu_list. For example, this happens if firmware fails to
fill in mmio_phys in the ACPI table leading to a NULL pointer
dereference in iommu_feature_disable.

Fixes: 2c0ae172 ('iommu/amd: Convert iommu initialization to state machine')
Signed-off-by: Kevin Mitchell <kevmitch@arista.com>
Signed-off-by: Joerg Roedel <jroedel@suse.de>

parent c1ddcf1c

drivers/iommu/amd_iommu_init.c

+3 −0

Original line number	Diff line number	Diff line
		@@ -418,6 +418,9 @@ static void iommu_enable(struct amd_iommu *iommu)

		static void iommu_disable(struct amd_iommu *iommu)
		{
		if (!iommu->mmio_base)
		return;

		/* Disable command buffer */
		iommu_feature_disable(iommu, CONTROL_CMDBUF_EN);