diff options
| author | Kevin Wolf <kwolf@redhat.com> | 2012-02-08 14:34:38 +0100 |
|---|---|---|
| committer | Avi Kivity <avi@redhat.com> | 2012-03-08 14:10:26 +0200 |
| commit | 7f3d35fddd173e52886d03bc34b5b5d6f5bea343 (patch) | |
| tree | 9561913495a92c398b9b8e372d4e9a5c1d55c7f4 /arch/x86/kvm/x86.c | |
| parent | 9cc815e46911486f52bec60517d0f7b40d323bbc (diff) | |
| download | op-kernel-dev-7f3d35fddd173e52886d03bc34b5b5d6f5bea343.zip op-kernel-dev-7f3d35fddd173e52886d03bc34b5b5d6f5bea343.tar.gz | |
KVM: x86 emulator: Fix task switch privilege checks
Currently, all task switches check privileges against the DPL of the
TSS. This is only correct for jmp/call to a TSS. If a task gate is used,
the DPL of this take gate is used for the check instead. Exceptions,
external interrupts and iret shouldn't perform any check.
[avi: kill kvm-kmod remnants]
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
Signed-off-by: Avi Kivity <avi@redhat.com>
Diffstat (limited to 'arch/x86/kvm/x86.c')
| -rw-r--r-- | arch/x86/kvm/x86.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/arch/x86/kvm/x86.c b/arch/x86/kvm/x86.c index ca74c1d..490a1b1 100644 --- a/arch/x86/kvm/x86.c +++ b/arch/x86/kvm/x86.c @@ -5655,15 +5655,15 @@ int kvm_arch_vcpu_ioctl_set_mpstate(struct kvm_vcpu *vcpu, return 0; } -int kvm_task_switch(struct kvm_vcpu *vcpu, u16 tss_selector, int reason, - bool has_error_code, u32 error_code) +int kvm_task_switch(struct kvm_vcpu *vcpu, u16 tss_selector, int idt_index, + int reason, bool has_error_code, u32 error_code) { struct x86_emulate_ctxt *ctxt = &vcpu->arch.emulate_ctxt; int ret; init_emulate_ctxt(vcpu); - ret = emulator_task_switch(ctxt, tss_selector, reason, + ret = emulator_task_switch(ctxt, tss_selector, idt_index, reason, has_error_code, error_code); if (ret) |
