diff options
| author | Jan Beulich <jbeulich@suse.com> | 2013-08-20 15:38:24 +0200 |
|---|---|---|
| committer | Jan Beulich <jbeulich@suse.com> | 2013-08-20 15:38:24 +0200 |
| commit | 4d1549ec621b69741177b3386648b99c8d643ca1 (patch) | |
| tree | 1278402adafd896c0b13890f9814d657d888fef0 | |
| parent | 70ac97c6150f7a2e182c10654f191490cde90303 (diff) | |
| download | xen-4d1549ec621b69741177b3386648b99c8d643ca1.tar.gz xen-4d1549ec621b69741177b3386648b99c8d643ca1.tar.bz2 xen-4d1549ec621b69741177b3386648b99c8d643ca1.zip | |
VT-d: protect against bogus information coming from BIOS
Add checks similar to those done by Linux: The DRHD address must not
be all zeros or all ones (Linux only checks for zero), and capabilities
as well as extended capabilities must not be all ones.
Signed-off-by: Jan Beulich <jbeulich@suse.com>
Reviewed-by: Ben Guthro <benjamin.guthro@citrix.com>
Reviewed-by: Andrew Cooper <andrew.cooper3@citrix.com>
Tested-by: Ben Guthro <benjamin.guthro@citrix.com>
Acked by: Yang Zhang <yang.z.zhang@intel.com>
Acked-by: Xiantao Zhang <xiantao.zhang@intel.com>
master commit: e8e8b030ecf916fea19639f0b6a446c1c9dbe174
master date: 2013-08-14 11:18:24 +0200
| -rw-r--r-- | xen/drivers/passthrough/vtd/dmar.c | 3 | ||||
| -rw-r--r-- | xen/drivers/passthrough/vtd/iommu.c | 3 |
2 files changed, 6 insertions, 0 deletions
diff --git a/xen/drivers/passthrough/vtd/dmar.c b/xen/drivers/passthrough/vtd/dmar.c index 464c14a38f..309a985447 100644 --- a/xen/drivers/passthrough/vtd/dmar.c +++ b/xen/drivers/passthrough/vtd/dmar.c @@ -405,6 +405,9 @@ acpi_parse_one_drhd(struct acpi_dmar_header *header) if ( (ret = acpi_dmar_check_length(header, sizeof(*drhd))) != 0 ) return ret; + if ( !drhd->address || !(drhd->address + 1) ) + return -ENODEV; + dmaru = xzalloc(struct acpi_drhd_unit); if ( !dmaru ) return -ENOMEM; diff --git a/xen/drivers/passthrough/vtd/iommu.c b/xen/drivers/passthrough/vtd/iommu.c index 071a91b0ac..8c24c04584 100644 --- a/xen/drivers/passthrough/vtd/iommu.c +++ b/xen/drivers/passthrough/vtd/iommu.c @@ -1198,6 +1198,9 @@ int __init iommu_alloc(struct acpi_drhd_unit *drhd) dprintk(VTDPREFIX, "cap = %"PRIx64" ecap = %"PRIx64"\n", iommu->cap, iommu->ecap); } + if ( !(iommu->cap + 1) || !(iommu->ecap + 1) ) + return -ENODEV; + if ( cap_fault_reg_offset(iommu->cap) + cap_num_fault_regs(iommu->cap) * PRIMARY_FAULT_REG_LEN >= PAGE_SIZE || ecap_iotlb_offset(iommu->ecap) >= PAGE_SIZE ) |