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
25 lines
829 B
Diff
25 lines
829 B
Diff
# Commit f67af6d5803b6a015e30cb490a94f9547cb0437c
|
|
# Date 2013-08-14 11:20:26 +0200
|
|
# Author Jan Beulich <jbeulich@suse.com>
|
|
# Committer Jan Beulich <jbeulich@suse.com>
|
|
x86/MTRR: fix range check in mtrr_add_page()
|
|
|
|
Extracted from Yinghai Lu's Linux commit d5c78673 ("x86: Fix /proc/mtrr
|
|
with base/size more than 44bits").
|
|
|
|
Signed-off-by: Jan Beulich <jbeulich@suse.com>
|
|
Reviewed-by: Andrew Cooper <andrew.cooper3@citrix.com>
|
|
Acked-by: Keir Fraser <keir@xen.org>
|
|
|
|
--- a/xen/arch/x86/cpu/mtrr/main.c
|
|
+++ b/xen/arch/x86/cpu/mtrr/main.c
|
|
@@ -340,7 +340,7 @@ int mtrr_add_page(unsigned long base, un
|
|
return -EINVAL;
|
|
}
|
|
|
|
- if (base & size_or_mask || size & size_or_mask) {
|
|
+ if ((base | (base + size - 1)) >> (paddr_bits - PAGE_SHIFT)) {
|
|
printk(KERN_WARNING "mtrr: base or size exceeds the MTRR width\n");
|
|
return -EINVAL;
|
|
}
|