30 lines
1.1 KiB
Diff
30 lines
1.1 KiB
Diff
|
x86/VMX: prevent INVVPID failure due to non-canonical guest address
|
||
|
|
||
|
While INVLPG (and on SVM INVLPGA) don't fault on non-canonical
|
||
|
addresses, INVVPID fails (in the "individual address" case) when passed
|
||
|
such an address.
|
||
|
|
||
|
Since such intercepted INVLPG are effectively no-ops anyway, don't fix
|
||
|
this in vmx_invlpg_intercept(), but instead have paging_invlpg() never
|
||
|
return true in such a case.
|
||
|
|
||
|
This is XSA-168.
|
||
|
|
||
|
Signed-off-by: Jan Beulich <jbeulich@suse.com>
|
||
|
Reviewed-by: Andrew Cooper <andrew.cooper3@citrix.com>
|
||
|
Acked-by: Ian Campbell <ian.campbell@citrix.com>
|
||
|
|
||
|
Index: xen-4.6.0-testing/xen/include/asm-x86/paging.h
|
||
|
===================================================================
|
||
|
--- xen-4.6.0-testing.orig/xen/include/asm-x86/paging.h
|
||
|
+++ xen-4.6.0-testing/xen/include/asm-x86/paging.h
|
||
|
@@ -245,7 +245,7 @@ paging_fault(unsigned long va, struct cp
|
||
|
* or 0 if it's safe not to do so. */
|
||
|
static inline int paging_invlpg(struct vcpu *v, unsigned long va)
|
||
|
{
|
||
|
- return paging_get_hostmode(v)->invlpg(v, va);
|
||
|
+ return is_canonical_address(va) && paging_get_hostmode(v)->invlpg(v, va);
|
||
|
}
|
||
|
|
||
|
/* Translate a guest virtual address to the frame number that the
|