summaryrefslogtreecommitdiffstats
path: root/arch/x86/kvm
diff options
context:
space:
mode:
authorAvi Kivity <avi@redhat.com>2011-11-10 14:57:29 +0200
committerAvi Kivity <avi@redhat.com>2011-12-27 11:24:41 +0200
commit80bdec64c05b645708b0dd97919783ad077fcdc8 (patch)
tree549b2084fe5b53b234c0638b1086ff04c08934b6 /arch/x86/kvm
parenta6c06ed1a60aff77b27ba558c315c3fed4e35565 (diff)
downloadlinux-stable-80bdec64c05b645708b0dd97919783ad077fcdc8.tar.gz
linux-stable-80bdec64c05b645708b0dd97919783ad077fcdc8.tar.bz2
linux-stable-80bdec64c05b645708b0dd97919783ad077fcdc8.zip
KVM: x86 emulator: fix RDPMC privilege check
RDPMC is only privileged if CR4.PCE=0. check_rdpmc() already implements this, so all we need to do is drop the Priv flag. Signed-off-by: Avi Kivity <avi@redhat.com> Signed-off-by: Gleb Natapov <gleb@redhat.com> Signed-off-by: Avi Kivity <avi@redhat.com>
Diffstat (limited to 'arch/x86/kvm')
-rw-r--r--arch/x86/kvm/emulate.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86/kvm/emulate.c b/arch/x86/kvm/emulate.c
index de7be77820d5..d270f1a817dc 100644
--- a/arch/x86/kvm/emulate.c
+++ b/arch/x86/kvm/emulate.c
@@ -3411,7 +3411,7 @@ static struct opcode twobyte_table[256] = {
II(ImplicitOps | Priv, em_wrmsr, wrmsr),
IIP(ImplicitOps, em_rdtsc, rdtsc, check_rdtsc),
II(ImplicitOps | Priv, em_rdmsr, rdmsr),
- DIP(ImplicitOps | Priv, rdpmc, check_rdpmc),
+ DIP(ImplicitOps, rdpmc, check_rdpmc),
I(ImplicitOps | VendorSpecific, em_sysenter),
I(ImplicitOps | Priv | VendorSpecific, em_sysexit),
N, N,