]> asedeno.scripts.mit.edu Git - linux.git/commit
iommu/vt-d: Fix crash on boot when DMAR is disabled
authorAndy Shevchenko <andriy.shevchenko@linux.intel.com>
Wed, 15 Feb 2017 14:42:21 +0000 (16:42 +0200)
committerJoerg Roedel <jroedel@suse.de>
Wed, 22 Feb 2017 11:25:31 +0000 (12:25 +0100)
commitc37a01779b3954d9c8f9ac4f663a03c11f69fded
treeee7cdceae13d62f25495fa77591b2ea0ab7cd19e
parentebb4949eb32ff500602f960525592fc4e614c5a7
iommu/vt-d: Fix crash on boot when DMAR is disabled

By default CONFIG_INTEL_IOMMU_DEFAULT_ON is not set and thus
dmar_disabled variable is set.

Intel IOMMU driver based on above doesn't set intel_iommu_enabled
variable.

The commit b0119e870837 ("iommu: Introduce new 'struct iommu_device'")
mistakenly assumes it never happens and tries to unregister not ever
registered resources, which crashes the kernel at boot time:

BUG: unable to handle kernel NULL pointer dereference at 0000000000000008
IP: iommu_device_unregister+0x31/0x60

Make unregister procedure conditional in free_iommu().

Fixes: b0119e870837 ("iommu: Introduce new 'struct iommu_device'")
Cc: Joerg Roedel <jroedel@suse.de>
Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Signed-off-by: Joerg Roedel <jroedel@suse.de>
drivers/iommu/dmar.c