KVM: x86: Fix far-jump to non-canonical check
authorNadav Amit <namit@cs.technion.ac.il>
Mon, 27 Oct 2014 22:03:43 +0000 (00:03 +0200)
committerZefan Li <lizefan@huawei.com>
Mon, 2 Feb 2015 09:05:25 +0000 (17:05 +0800)
commitcfa0515dc4826a9d14bc871d88d6d80bafe0e7cf
tree9746650c5a2c12e71d825e1432145b5ce94e26fc
parent29adeacbed114e97e7aaee3bb2e4be65ec806dcb
KVM: x86: Fix far-jump to non-canonical check

commit 7e46dddd6f6cd5dbf3c7bd04a7e75d19475ac9f2 upstream.

Commit d1442d85cc30 ("KVM: x86: Handle errors when RIP is set during far
jumps") introduced a bug that caused the fix to be incomplete.  Due to
incorrect evaluation, far jump to segment with L bit cleared (i.e., 32-bit
segment) and RIP with any of the high bits set (i.e, RIP[63:32] != 0) set may
not trigger #GP.  As we know, this imposes a security problem.

In addition, the condition for two warnings was incorrect.

Fixes: d1442d85cc30ea75f7d399474ca738e0bc96f715
Reported-by: Dan Carpenter <dan.carpenter@oracle.com>
Signed-off-by: Nadav Amit <namit@cs.technion.ac.il>
[Add #ifdef CONFIG_X86_64 to avoid complaints of undefined behavior. - Paolo]
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Signed-off-by: Zefan Li <lizefan@huawei.com>
arch/x86/kvm/emulate.c