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;
|
||
|
|
}
|