Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 288e4877 authored by Dirk Hohndel's avatar Dirk Hohndel Committed by Linus Torvalds
Browse files

Prevent oops at boot with VT-d 



With some broken BIOSs when VT-d is enabled, the data structures are
filled incorrectly. This can cause a NULL pointer dereference in very
early boot.

Signed-off-by: default avatarDirk Hohndel <hohndel@linux.intel.com>
Acked-by: default avatarYu Zhao <yu.zhao@intel.com>
Signed-off-by: default avatarDavid Woodhouse <David.Woodhouse@intel.com>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 37a76bd4

drivers/pci/intel-iommu.c

+2 −1
Original line number Diff line number Diff line
@@ -438,7 +438,8 @@ static struct intel_iommu *device_to_iommu(u8 bus, u8 devfn) 
			continue;



		for (i = 0; i < drhd->devices_cnt; i++)

			if (drhd->devices[i]->bus->number == bus &&

			if (drhd->devices[i] &&

			    drhd->devices[i]->bus->number == bus &&

			    drhd->devices[i]->devfn == devfn)

				return drhd->iommu;