73291eb01a
automatically update UEFI boot binary xen.spec - Upstream patches from Jan 51d5334e-x86-mm-Ensure-useful-progress-in-alloc_l2_table.patch 51dd155c-adjust-x86-EFI-build.patch 51e63d80-x86-cpuidle-Change-logging-for-unknown-APIC-IDs.patch 51e6540d-x86-don-t-use-destroy_xen_mappings-for-vunmap.patch 51e7963f-x86-time-Update-wallclock-in-shared-info-when-altering-domain-time-offset.patch 51ffd577-fix-off-by-one-mistakes-in-vm_alloc.patch 51ffd5fd-x86-refine-FPU-selector-handling-code-for-XSAVEOPT.patch 520114bb-Nested-VMX-Flush-TLBs-and-Caches-if-paging-mode-changed.patch 520a5504-VMX-add-boot-parameter-to-enable-disable-APIC-v-dynamically.patch 520a24f6-x86-AMD-Fix-nested-svm-crash-due-to-assertion-in-__virt_to_maddr.patch 520a2570-x86-AMD-Inject-GP-instead-of-UD-when-unable-to-map-vmcb.patch 520b4b60-VT-d-protect-against-bogus-information-coming-from-BIOS.patch 520b4bda-x86-MTRR-fix-range-check-in-mtrr_add_page.patch 520cb8b6-x86-time-fix-check-for-negative-time-in-__update_vcpu_system_time.patch 520d417d-xen-Add-stdbool.h-workaround-for-BSD.patch OBS-URL: https://build.opensuse.org/package/show/Virtualization/xen?expand=0&rev=266
42 lines
1.6 KiB
Diff
42 lines
1.6 KiB
Diff
# Commit e8e8b030ecf916fea19639f0b6a446c1c9dbe174
|
|
# Date 2013-08-14 11:18:24 +0200
|
|
# Author Jan Beulich <jbeulich@suse.com>
|
|
# Committer Jan Beulich <jbeulich@suse.com>
|
|
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>
|
|
|
|
--- a/xen/drivers/passthrough/vtd/dmar.c
|
|
+++ b/xen/drivers/passthrough/vtd/dmar.c
|
|
@@ -447,6 +447,9 @@ acpi_parse_one_drhd(struct acpi_dmar_hea
|
|
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;
|
|
--- a/xen/drivers/passthrough/vtd/iommu.c
|
|
+++ b/xen/drivers/passthrough/vtd/iommu.c
|
|
@@ -1159,6 +1159,9 @@ int __init iommu_alloc(struct acpi_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 )
|