diff options
| author | Avi Kivity <avi@redhat.com> | 2009-09-01 12:03:25 +0300 |
|---|---|---|
| committer | Avi Kivity <avi@redhat.com> | 2009-09-10 18:11:10 +0300 |
| commit | 0a79b009525b160081d75cef5dbf45817956acf2 (patch) | |
| tree | 86dc2671cbd3326e92c8845ce699bdb651d785b5 /arch/x86/kvm/x86.c | |
| parent | 4da748960a6bd7b1e123e01bfa8f2dbcb6be209e (diff) | |
| download | lwn-0a79b009525b160081d75cef5dbf45817956acf2.tar.gz lwn-0a79b009525b160081d75cef5dbf45817956acf2.zip | |
KVM: VMX: Check cpl before emulating debug register access
Debug registers may only be accessed from cpl 0. Unfortunately, vmx will
code to emulate the instruction even though it was issued from guest
userspace, possibly leading to an unexpected trap later.
Cc: stable@kernel.org
Signed-off-by: Avi Kivity <avi@redhat.com>
Signed-off-by: Marcelo Tosatti <mtosatti@redhat.com>
Diffstat (limited to 'arch/x86/kvm/x86.c')
| -rw-r--r-- | arch/x86/kvm/x86.c | 13 |
1 files changed, 13 insertions, 0 deletions
diff --git a/arch/x86/kvm/x86.c b/arch/x86/kvm/x86.c index 7627ff607a90..4137cc579ba5 100644 --- a/arch/x86/kvm/x86.c +++ b/arch/x86/kvm/x86.c @@ -223,6 +223,19 @@ void kvm_queue_exception_e(struct kvm_vcpu *vcpu, unsigned nr, u32 error_code) EXPORT_SYMBOL_GPL(kvm_queue_exception_e); /* + * Checks if cpl <= required_cpl; if true, return true. Otherwise queue + * a #GP and return false. + */ +bool kvm_require_cpl(struct kvm_vcpu *vcpu, int required_cpl) +{ + if (kvm_x86_ops->get_cpl(vcpu) <= required_cpl) + return true; + kvm_queue_exception_e(vcpu, GP_VECTOR, 0); + return false; +} +EXPORT_SYMBOL_GPL(kvm_require_cpl); + +/* * Load the pae pdptrs. Return true is they are all valid. */ int load_pdptrs(struct kvm_vcpu *vcpu, unsigned long cr3) |