diff options
| author | Jan Beulich <jbeulich@suse.com> | 2013-08-20 15:39:07 +0200 |
|---|---|---|
| committer | Jan Beulich <jbeulich@suse.com> | 2013-08-20 15:39:07 +0200 |
| commit | d1eca89587990c47edf54091dabe187d8317bafb (patch) | |
| tree | 5709845d4c64c0e12244f840f543ff0a301713e2 | |
| parent | 4d1549ec621b69741177b3386648b99c8d643ca1 (diff) | |
| download | xen-d1eca89587990c47edf54091dabe187d8317bafb.tar.gz xen-d1eca89587990c47edf54091dabe187d8317bafb.tar.bz2 xen-d1eca89587990c47edf54091dabe187d8317bafb.zip | |
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>
master commit: f67af6d5803b6a015e30cb490a94f9547cb0437c
master date: 2013-08-14 11:20:26 +0200
| -rw-r--r-- | xen/arch/x86/cpu/mtrr/main.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/xen/arch/x86/cpu/mtrr/main.c b/xen/arch/x86/cpu/mtrr/main.c index 45d08986b2..2b3d29fab5 100644 --- a/xen/arch/x86/cpu/mtrr/main.c +++ b/xen/arch/x86/cpu/mtrr/main.c @@ -350,7 +350,7 @@ int mtrr_add_page(unsigned long base, unsigned long size, 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; } |