Miscellaneous x86 emulator fixes
v2 cover Miscellaneous x86 emulator fixes
X86 emulator fails to do permission/correctness checking like real CPU does for some instruction. This patch series fixes some of those discrepancies.
Changelog:
v1->v2
- move IOPL permission checking functions into emulate.c
- rename them to more intuitive names
- fix tr segment limit checking
Gleb Natapov (8):
KVM: Add group8 instruction decoding.
KVM: Add group9 instruction decoding.
KVM: Add Virtual-8086 mode of emulation.
KVM: fix memory access during x86 emulation.
KVM: Check IOPL level during io instruction emulation.
KVM: Fix popf emulation.
KVM: Check CPL level during privilege instruction emulation.
KVM: Add LOCK prefix validity checking.
arch/x86/include/asm/kvm_emulate.h | 15 ++- arch/x86/include/asm/kvm_host.h | 8 +- arch/x86/kvm/emulate.c | 286 ++++++++++++++++++++++++++++-------- arch/x86/kvm/mmu.c | 17 +-- arch/x86/kvm/mmu.h | 6 + arch/x86/kvm/paging_tmpl.h | 11 +- arch/x86/kvm/x86.c | 144 +++++++++++++----- 7 files changed, 368 insertions(+), 119 deletions(-)
PATCH v2 1/8 KVM: Add group8 instruction decoding.
Use groups mechanism to decode 0F BA instructions.
--- arch/x86/kvm/emulate.c | 7 ++++++- 1 files changed, 6 insertions(+), 1 deletions(-)
arch/x86/kvm/emulate.c +6 -1
@@ -88,6 +88,7 @@enum { Group1_80, Group1_81, Group1_82, Group1_83, Group1A, Group3_Byte, Group3, Group4, Group5, Group7, + Group8, };static u32 opcode_table[256 ] = {
@@ -267,7 +268,7 @@ static u32 twobyte_table[256] = {0 ,0 , ByteOp | DstReg | SrcMem | ModRM | Mov, DstReg | SrcMem16 | ModRM | Mov,/* 0xB8 - 0xBF */ -0 ,0 , DstMem | SrcImmByte | ModRM, DstMem | SrcReg | ModRM | BitOp, +0 ,0 , Group | Group8, DstMem | SrcReg | ModRM | BitOp,0 ,0 , ByteOp | DstReg | SrcMem | ModRM | Mov, DstReg | SrcMem16 | ModRM | Mov, /* 0xC0 - 0xCF */
@@ -323,6 +324,10 @@ static u32 group_table[] = {0 ,0 , ModRM | SrcMem, ModRM | SrcMem, SrcNone | ModRM | DstMem | Mov,0 , SrcMem16 | ModRM | Mov, SrcMem | ModRM | ByteOp, + [Group8*8 ] = +0 ,0 ,0 ,0 , + DstMem | SrcImmByte | ModRM, DstMem | SrcImmByte | ModRM, + DstMem | SrcImmByte | ModRM, DstMem | SrcImmByte | ModRM, }; static u32 group2_table[] = {
Signature · 1 line
1.6.5
PATCH v2 2/8 KVM: Add group9 instruction decoding.
In reply to Gleb NatapovUse groups mechanism to decode 0F C7 instructions.
--- arch/x86/kvm/emulate.c | 9 +++++++-- 1 files changed, 7 insertions(+), 2 deletions(-)
arch/x86/kvm/emulate.c +7 -2
@@ -88,7 +88,7 @@enum { Group1_80, Group1_81, Group1_82, Group1_83, Group1A, Group3_Byte, Group3, Group4, Group5, Group7, - Group8, + Group8, Group9, };static u32 opcode_table[256 ] = {
@@ -272,7 +272,8 @@ static u32 twobyte_table[256] = {0 ,0 , ByteOp | DstReg | SrcMem | ModRM | Mov, DstReg | SrcMem16 | ModRM | Mov,/* 0xC0 - 0xCF */ -0 ,0 ,0 , DstMem | SrcReg | ModRM | Mov,0 ,0 ,0 , ImplicitOps | ModRM, +0 ,0 ,0 , DstMem | SrcReg | ModRM | Mov, +0 ,0 ,0 , Group | GroupDual | Group9,0 ,0 ,0 ,0 ,0 ,0 ,0 ,0 ,/* 0xD0 - 0xDF */ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
@@ -328,6 +329,8 @@ static u32 group_table[] = {0 ,0 ,0 ,0 , DstMem | SrcImmByte | ModRM, DstMem | SrcImmByte | ModRM, DstMem | SrcImmByte | ModRM, DstMem | SrcImmByte | ModRM, + [Group9*8 ] = + 0, ImplicitOps | ModRM, 0, 0, 0, 0, 0, 0, }; static u32 group2_table[] = {
@@ -335,6 +338,8 @@ static u32 group2_table[] = { SrcNone | ModRM,0 ,0 , SrcNone | ModRM, SrcNone | ModRM | DstMem | Mov,0 , SrcMem16 | ModRM | Mov, 0, + [Group9*8 ] = + 0, 0, 0, 0, 0, 0, 0, 0, };/* EFLAGS bit definitions. */
Signature · 1 line
1.6.5
PATCH v2 3/8 KVM: Add Virtual-8086 mode of emulation.
In reply to Gleb NatapovFor some instructions CPU behaves differently for real-mode and virtual 8086. Let emulator know which mode cpu is in, so it will not poke into vcpu state directly.
--- arch/x86/include/asm/kvm_emulate.h | 1 + arch/x86/kvm/emulate.c | 12 +++++++----- arch/x86/kvm/x86.c | 3 ++- 3 files changed, 10 insertions(+), 6 deletions(-)
arch/x86/include/asm/kvm_emulate.h +1 -0
@@ -168,6 +168,7 @@ struct x86_emulate_ctxt {/* Execution mode, passed to the emulator. */ #define X86EMUL_MODE_REAL 0/* Real mode. */ +#define X86EMUL_MODE_VM86 1/* Virtual 8086 mode. */ #define X86EMUL_MODE_PROT16 2/* 16-bit protected mode. */ #define X86EMUL_MODE_PROT32 4/* 32-bit protected mode. */ #define X86EMUL_MODE_PROT64 8/* 64-bit (long) mode. */
arch/x86/kvm/emulate.c +7 -5
@@ -899,6 +899,7 @@ x86_decode_insn(struct x86_emulate_ctxt *ctxt, struct x86_emulate_ops *ops)switch (mode) {case X86EMUL_MODE_REAL : +case X86EMUL_MODE_VM86 :case X86EMUL_MODE_PROT16 : def_op_bytes = def_ad_bytes =2 ;break ;
@@ -1525,7 +1526,7 @@ emulate_syscall(struct x86_emulate_ctxt *ctxt)/* syscall is not available in real mode */ if (c->lock_prefix || ctxt->mode ==X86EMUL_MODE_REAL - || !is_protmode (ctxt->vcpu)) + || ctxt->mode ==X86EMUL_MODE_VM86 )return -1 ;setup_syscalls_segments (ctxt, &cs, &ss);
@@ -1577,8 +1578,8 @@ emulate_sysenter(struct x86_emulate_ctxt *ctxt)if (c->lock_prefix)return -1 ; -/* inject #GP if in real mode or paging is disabled */ -if (ctxt->mode ==X86EMUL_MODE_REAL || !is_protmode (ctxt->vcpu)) { +/* inject #GP if in real mode */ +if (ctxt->mode ==X86EMUL_MODE_REAL ) {kvm_inject_gp (ctxt->vcpu,0 );return -1 ; }
@@ -1642,8 +1643,9 @@ emulate_sysexit(struct x86_emulate_ctxt *ctxt)if (c->lock_prefix)return -1 ; -/* inject #GP if in real mode or paging is disabled */ -if (ctxt->mode ==X86EMUL_MODE_REAL || !is_protmode (ctxt->vcpu)) { +/* inject #GP if in real mode or Virtual 8086 mode */ +if (ctxt->mode ==X86EMUL_MODE_REAL || + ctxt->mode ==X86EMUL_MODE_VM86 ) {kvm_inject_gp (ctxt->vcpu,0 );return -1 ; }
arch/x86/kvm/x86.c +2 -1
@@ -3348,8 +3348,9 @@ int emulate_instruction(struct kvm_vcpu *vcpu, vcpu->arch.emulate_ctxt.vcpu = vcpu; vcpu->arch.emulate_ctxt.eflags =kvm_get_rflags (vcpu); vcpu->arch.emulate_ctxt.mode = + (!is_protmode (vcpu)) ?X86EMUL_MODE_REAL : (vcpu->arch.emulate_ctxt.eflags &X86_EFLAGS_VM ) - ?X86EMUL_MODE_REAL : cs_l + ?X86EMUL_MODE_VM86 : cs_l ?X86EMUL_MODE_PROT64 : cs_db ?X86EMUL_MODE_PROT32 :X86EMUL_MODE_PROT16 ;
Signature · 1 line
1.6.5
PATCH v2 4/8 KVM: fix memory access during x86 emulation.
In reply to Gleb NatapovCurrently when x86 emulator needs to access memory, page walk is done with broadest permission possible, so if emulated instruction was executed by userspace process it can still access kernel memory. Fix that by providing correct memory access to page walker during emulation.
--- arch/x86/include/asm/kvm_emulate.h | 14 +++- arch/x86/include/asm/kvm_host.h | 7 ++- arch/x86/kvm/emulate.c | 6 +- arch/x86/kvm/mmu.c | 17 ++--- arch/x86/kvm/mmu.h | 6 ++ arch/x86/kvm/paging_tmpl.h | 11 ++- arch/x86/kvm/x86.c | 131 +++++++++++++++++++++++++++--------- 7 files changed, 142 insertions(+), 50 deletions(-)
arch/x86/include/asm/kvm_emulate.h +12 -2
@@ -54,13 +54,23 @@ struct x86_emulate_ctxt;struct x86_emulate_ops {/* * read_std: Read bytes of standard (non-emulated/special) memory. -* Used for instruction fetch, stack operations, and others. +* Used for descriptor reading. * @addr: [IN ] Linear address from which to read. * @val: [OUT] Value read from memory, zero-extended to 'u_long'. * @bytes: [IN ] Number of bytes to read from memory. */ int (*read_std)(unsigned long addr,void *val, -unsigned int bytes,struct kvm_vcpu *vcpu); +unsigned int bytes,struct kvm_vcpu *vcpu,u32 *error); + +/* +* fetch: Read bytes of standard (non-emulated/special) memory. +* Used for instruction fetch. +* @addr: [IN ] Linear address from which to read. +* @val: [OUT] Value read from memory, zero-extended to 'u_long'. +* @bytes: [IN ] Number of bytes to read from memory. +*/ +int (*fetch)(unsigned long addr,void *val, +unsigned int bytes,struct kvm_vcpu *vcpu,u32 *error);/* * read_emulated: Read bytes from emulated/special memory area.
arch/x86/include/asm/kvm_host.h +6 -1
@@ -243,7 +243,8 @@ struct kvm_mmu {void (*new_cr3)(struct kvm_vcpu *vcpu);int (*page_fault)(struct kvm_vcpu *vcpu,gva_t gva,u32 err);void (*free)(struct kvm_vcpu *vcpu); -gpa_t (*gva_to_gpa)(struct kvm_vcpu *vcpu,gva_t gva); +gpa_t (*gva_to_gpa)(struct kvm_vcpu *vcpu,gva_t gva,u32 access, +u32 *error);void (*prefetch_page)(struct kvm_vcpu *vcpu,struct kvm_mmu_page *page); int (*sync_page)(struct kvm_vcpu *vcpu,
@@ -660,6 +661,10 @@ void __kvm_mmu_free_some_pages(struct kvm_vcpu *vcpu);int kvm_mmu_load (struct kvm_vcpu *vcpu);void kvm_mmu_unload (struct kvm_vcpu *vcpu);void kvm_mmu_sync_roots (struct kvm_vcpu *vcpu); +gpa_t kvm_mmu_gva_to_gpa_read (struct kvm_vcpu *vcpu,gva_t gva,u32 *error); +gpa_t kvm_mmu_gva_to_gpa_fetch (struct kvm_vcpu *vcpu,gva_t gva,u32 *error); +gpa_t kvm_mmu_gva_to_gpa_write (struct kvm_vcpu *vcpu,gva_t gva,u32 *error); +gpa_t kvm_mmu_gva_to_gpa_system (struct kvm_vcpu *vcpu,gva_t gva,u32 *error);int kvm_emulate_hypercall (struct kvm_vcpu *vcpu);
arch/x86/kvm/emulate.c +3 -3
@@ -616,7 +616,7 @@ static int do_fetch_insn_byte(struct x86_emulate_ctxt *ctxt,if (linear < fc->start || linear >= fc->end) { size =min (15UL ,PAGE_SIZE -offset_in_page (linear)); - rc = ops->read_std (linear, fc->data, size, ctxt->vcpu); + rc = ops->fetch (linear, fc->data, size, ctxt->vcpu,NULL );if (rc)return rc; fc->start = linear;
@@ -671,11 +671,11 @@ static int read_descriptor(struct x86_emulate_ctxt *ctxt, op_bytes =3 ; *address =0 ; rc = ops->read_std ((unsigned long )ptr, (unsigned long *)size,2 , - ctxt->vcpu); + ctxt->vcpu,NULL );if (rc)return rc; rc = ops->read_std ((unsigned long )ptr +2 , address, op_bytes, - ctxt->vcpu); + ctxt->vcpu,NULL );return rc; }
arch/x86/kvm/mmu.c +7 -10
@@ -138,12 +138,6 @@ module_param(oos_shadow, bool, 0644);#define PT64_PERM_MASK (PT_PRESENT_MASK | PT_WRITABLE_MASK | PT_USER_MASK \ | PT64_NX_MASK) -#define PFERR_PRESENT_MASK (1U << 0) -#define PFERR_WRITE_MASK (1U << 1) -#define PFERR_USER_MASK (1U << 2) -#define PFERR_RSVD_MASK (1U << 3) -#define PFERR_FETCH_MASK (1U << 4) -#define RMAP_EXT 4#define ACC_EXEC_MASK 1
@@ -1621,7 +1615,7 @@ struct page *gva_to_page(struct kvm_vcpu *vcpu, gva_t gva) {struct page *page; -gpa_t gpa = vcpu->arch.mmu.gva_to_gpa (vcpu, gva); +gpa_t gpa =kvm_mmu_gva_to_gpa_read (vcpu, gva,NULL );if (gpa ==UNMAPPED_GVA )return NULL ;
@@ -2144,8 +2138,11 @@ void kvm_mmu_sync_roots(struct kvm_vcpu *vcpu)spin_unlock (&vcpu->kvm->mmu_lock); } -static gpa_t nonpaging_gva_to_gpa (struct kvm_vcpu *vcpu,gva_t vaddr) +static gpa_t nonpaging_gva_to_gpa (struct kvm_vcpu *vcpu,gva_t vaddr, +u32 access,u32 *error) { +if (error) + *error =0 ;return vaddr; }
@@ -2729,7 +2726,7 @@ int kvm_mmu_unprotect_page_virt(struct kvm_vcpu *vcpu, gva_t gva)if (tdp_enabled)return 0 ; - gpa = vcpu->arch.mmu.gva_to_gpa (vcpu, gva); + gpa =kvm_mmu_gva_to_gpa_read (vcpu, gva,NULL );spin_lock (&vcpu->kvm->mmu_lock); r =kvm_mmu_unprotect_page (vcpu->kvm, gpa >>PAGE_SHIFT );
@@ -3226,7 +3223,7 @@ static void audit_mappings_page(struct kvm_vcpu *vcpu, u64 page_pte,if (is_shadow_present_pte (ent) && !is_last_spte (ent, level))audit_mappings_page (vcpu, ent, va, level -1 );else { -gpa_t gpa = vcpu->arch.mmu.gva_to_gpa (vcpu, va); +gpa_t gpa =kvm_mmu_gva_to_gpa_read (vcpu, va,NULL );gfn_t gfn = gpa >>PAGE_SHIFT ;pfn_t pfn =gfn_to_pfn (vcpu->kvm, gfn);hpa_t hpa = (hpa_t )pfn <<PAGE_SHIFT ;
arch/x86/kvm/mmu.h +6 -0
@@ -42,6 +42,12 @@#define PT_DIRECTORY_LEVEL 2#define PT_PAGE_TABLE_LEVEL 1 +#define PFERR_PRESENT_MASK (1U << 0) +#define PFERR_WRITE_MASK (1U << 1) +#define PFERR_USER_MASK (1U << 2) +#define PFERR_RSVD_MASK (1U << 3) +#define PFERR_FETCH_MASK (1U << 4) +int kvm_mmu_get_spte_hierarchy (struct kvm_vcpu *vcpu,u64 addr,u64 sptes[4 ]);static inline void kvm_mmu_free_some_pages (struct kvm_vcpu *vcpu)
arch/x86/kvm/paging_tmpl.h +8 -3
@@ -490,18 +490,23 @@ static void FNAME(invlpg)(struct kvm_vcpu *vcpu, gva_t gva)spin_unlock (&vcpu->kvm->mmu_lock); } -static gpa_t FNAME (gva_to_gpa )(struct kvm_vcpu *vcpu,gva_t vaddr) +static gpa_t FNAME (gva_to_gpa )(struct kvm_vcpu *vcpu,gva_t vaddr,u32 access, +u32 *error) {struct guest_walker walker;gpa_t gpa =UNMAPPED_GVA ;int r; - r =FNAME (walk_addr)(&walker, vcpu, vaddr,0 ,0 ,0 ); + r =FNAME (walk_addr)(&walker, vcpu, vaddr, + !!(access &PFERR_WRITE_MASK ), + !!(access &PFERR_USER_MASK ), + !!(access &PFERR_FETCH_MASK ));if (r) { gpa =gfn_to_gpa (walker.gfn); gpa |= vaddr & ~PAGE_MASK ; - } + }else if (error) + *error = walker.error_code;return gpa; }
arch/x86/kvm/x86.c +100 -31
283 lines not on this page · raw message
Signature · 1 line
1.6.5
PATCH v2 5/8 KVM: Check IOPL level during io instruction emulation.
In reply to Gleb NatapovMake emulator check that vcpu is allowed to execute IN, INS, OUT, OUTS, CLI, STI.
--- arch/x86/include/asm/kvm_host.h | 1 + arch/x86/kvm/emulate.c | 89 +++++++++++++++++++++++++++++++++++--- arch/x86/kvm/x86.c | 10 ++--- 3 files changed, 87 insertions(+), 13 deletions(-)
arch/x86/include/asm/kvm_host.h +1 -0
@@ -678,6 +678,7 @@ void kvm_disable_tdp(void);int load_pdptrs (struct kvm_vcpu *vcpu,unsigned long cr3);int complete_pio (struct kvm_vcpu *vcpu); +bool kvm_check_iopl (struct kvm_vcpu *vcpu);struct kvm_memory_slot *gfn_to_memslot_unaliased (struct kvm *kvm,gfn_t gfn);
arch/x86/kvm/emulate.c +82 -7
121 lines not on this page · raw message
arch/x86/kvm/x86.c +4 -6
@@ -3599,6 +3599,8 @@ int kvm_emulate_pio(struct kvm_vcpu *vcpu, int in, int size, unsigned port) {unsigned long val; +trace_kvm_pio (!in, port, size,1 ); + vcpu->run->exit_reason =KVM_EXIT_IO ; vcpu->run->io.direction = in ?KVM_EXIT_IO_IN :KVM_EXIT_IO_OUT ; vcpu->run->io.size = vcpu->arch.pio.size = size;
@@ -3610,9 +3612,6 @@ int kvm_emulate_pio(struct kvm_vcpu *vcpu, int in, int size, unsigned port) vcpu->arch.pio.down =0 ; vcpu->arch.pio.rep =0 ; -trace_kvm_pio (vcpu->run->io.direction ==KVM_EXIT_IO_OUT , port, - size,1 ); - val =kvm_register_read (vcpu,VCPU_REGS_RAX );memcpy (vcpu->arch.pio_data, &val,4 );
@@ -3631,6 +3630,8 @@ int kvm_emulate_pio_string(struct kvm_vcpu *vcpu, int in,unsigned now, in_page;int ret =0 ; +trace_kvm_pio (!in, port, size, count); + vcpu->run->exit_reason =KVM_EXIT_IO ; vcpu->run->io.direction = in ?KVM_EXIT_IO_IN :KVM_EXIT_IO_OUT ; vcpu->run->io.size = vcpu->arch.pio.size = size;
@@ -3642,9 +3643,6 @@ int kvm_emulate_pio_string(struct kvm_vcpu *vcpu, int in, vcpu->arch.pio.down = down; vcpu->arch.pio.rep = rep; -trace_kvm_pio (vcpu->run->io.direction ==KVM_EXIT_IO_OUT , port, - size, count); -if (!count) { kvm_x86_ops->skip_emulated_instruction (vcpu);return 1 ;
Signature · 1 line
1.6.5
PATCH v2 6/8 KVM: Fix popf emulation.
In reply to Gleb NatapovPOPF behaves differently depending on current CPU mode. Emulate correct logic to prevent guest from changing flags that it can't change otherwise.
--- arch/x86/kvm/emulate.c | 55 +++++++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 54 insertions(+), 1 deletions(-)
arch/x86/kvm/emulate.c +54 -1
@@ -343,11 +343,18 @@ static u32 group2_table[] = { };/* EFLAGS bit definitions. */ +#define EFLG_ID (1<<21) +#define EFLG_VIP (1<<20) +#define EFLG_VIF (1<<19) +#define EFLG_AC (1<<18)#define EFLG_VM (1<<17)#define EFLG_RF (1<<16) +#define EFLG_IOPL (3<<12) +#define EFLG_NT (1<<14)#define EFLG_OF (1<<11)#define EFLG_DF (1<<10)#define EFLG_IF (1<<9) +#define EFLG_TF (1<<8)#define EFLG_SF (1<<7)#define EFLG_ZF (1<<6)#define EFLG_AF (1<<4)
@@ -1214,6 +1221,49 @@ static int emulate_pop(struct x86_emulate_ctxt *ctxt,return rc; } +static int emulate_popf (struct x86_emulate_ctxt *ctxt, +struct x86_emulate_ops *ops, +void *dest,int len) +{ +int rc; +unsigned long val, change_mask; +int iopl = (ctxt->eflags &X86_EFLAGS_IOPL ) >>IOPL_SHIFT ; +int cpl = kvm_x86_ops->get_cpl (ctxt->vcpu); + + rc =emulate_pop (ctxt, ops, &val, len); +if (rc !=X86EMUL_CONTINUE ) +return rc; + + change_mask =EFLG_CF |EFLG_PF |EFLG_AF |EFLG_ZF |EFLG_SF |EFLG_OF + |EFLG_TF |EFLG_DF |EFLG_NT |EFLG_RF |EFLG_AC |EFLG_ID ; + +switch (ctxt->mode) { +case X86EMUL_MODE_PROT64 : +case X86EMUL_MODE_PROT32 : +case X86EMUL_MODE_PROT16 : +if (cpl ==0 ) + change_mask |=EFLG_IOPL ; +if (cpl <= iopl) + change_mask |=EFLG_IF ; +break ; +case X86EMUL_MODE_VM86 : +if (iopl <3 ) { +kvm_inject_gp (ctxt->vcpu,0 ); +return X86EMUL_PROPAGATE_FAULT ; + } + change_mask |=EFLG_IF ; +break ; +default :/* real mode */ + change_mask |= (EFLG_IOPL |EFLG_IF ); +break ; + } + + *(unsigned long *)dest = + (ctxt->eflags & ~change_mask) | (val & change_mask); + +return rc; +} +static void emulate_push_sreg (struct x86_emulate_ctxt *ctxt,int seg) {struct decode_cache *c = &ctxt->decode;
@@ -2099,7 +2149,10 @@ special_insn: c->dst.type =OP_REG ; c->dst.ptr = (unsigned long *) &ctxt->eflags; c->dst.bytes = c->op_bytes; - goto pop_instruction; + rc =emulate_popf (ctxt, ops, &c->dst.val, c->op_bytes); +if (rc !=X86EMUL_CONTINUE ) + goto done; +break ; case 0xa0 ... 0xa1: /* mov */ c->dst.ptr = (unsigned long *)&c->regs[VCPU_REGS_RAX ]; c->dst.val = c->src.val;
Signature · 1 line
1.6.5
PATCH v2 7/8 KVM: Check CPL level during privilege instruction emulation.
In reply to Gleb NatapovAdd CPL checking in case emulator is tricked into emulating privilege instruction from userspace.
--- arch/x86/kvm/emulate.c | 35 ++++++++++++++++++++--------------- 1 files changed, 20 insertions(+), 15 deletions(-)
arch/x86/kvm/emulate.c +20 -15
@@ -76,6 +76,7 @@#define GroupDual (1<<15)/* Alternate decoding of mod == 3 */ #define GroupMask 0xff/* Group number stored in bits 0:7 */ /* Misc flags */ +#define Priv (1<<27)/* instruction generates #GP if current CPL != 0 */ #define No64 (1<<28)/* Source 2 operand type */ #define Src2None (0<<29)
@@ -211,7 +212,7 @@ static u32 opcode_table[256] = { SrcNone | ByteOp | ImplicitOps, SrcNone | ImplicitOps,/* 0xF0 - 0xF7 */ 0 ,0 ,0 ,0 , - ImplicitOps, ImplicitOps, Group | Group3_Byte, Group | Group3, + ImplicitOps | Priv, ImplicitOps, Group | Group3_Byte, Group | Group3,/* 0xF8 - 0xFF */ ImplicitOps,0 , ImplicitOps, ImplicitOps, ImplicitOps, ImplicitOps, Group | Group4, Group | Group5,
@@ -219,16 +220,20 @@ static u32 opcode_table[256] = {static u32 twobyte_table[256 ] = {/* 0x00 - 0x0F */ -0 , Group | GroupDual | Group7,0 ,0 ,0 , ImplicitOps, ImplicitOps,0 , - ImplicitOps, ImplicitOps,0 ,0 ,0 , ImplicitOps | ModRM,0 ,0 , +0 , Group | GroupDual | Group7,0 ,0 , +0 , ImplicitOps, ImplicitOps | Priv,0 , + ImplicitOps | Priv, ImplicitOps | Priv,0 ,0 , +0 , ImplicitOps | ModRM,0 ,0 ,/* 0x10 - 0x1F */ 0 ,0 ,0 ,0 ,0 ,0 ,0 ,0 , ImplicitOps | ModRM,0 ,0 ,0 ,0 ,0 ,0 ,0 ,/* 0x20 - 0x2F */ - ModRM | ImplicitOps, ModRM, ModRM | ImplicitOps, ModRM,0 ,0 ,0 ,0 , + ModRM | ImplicitOps | Priv, ModRM | Priv, + ModRM | ImplicitOps | Priv, ModRM | Priv, +0 ,0 ,0 ,0 ,0 ,0 ,0 ,0 ,0 ,0 ,0 ,0 ,/* 0x30 - 0x3F */ - ImplicitOps,0 , ImplicitOps,0 , - ImplicitOps, ImplicitOps,0 ,0 , + ImplicitOps | Priv,0 , ImplicitOps | Priv,0 , + ImplicitOps, ImplicitOps | Priv,0 ,0 ,0 ,0 ,0 ,0 ,0 ,0 ,0 ,0 ,/* 0x40 - 0x47 */ DstReg | SrcMem | ModRM | Mov, DstReg | SrcMem | ModRM | Mov,
@@ -322,9 +327,9 @@ static u32 group_table[] = { SrcMem | ModRM | Stack,0 , SrcMem | ModRM | Stack, 0, SrcMem | ModRM | Stack, 0, [Group7*8 ] = -0 ,0 , ModRM | SrcMem, ModRM | SrcMem, +0 ,0 , ModRM | SrcMem | Priv, ModRM | SrcMem | Priv, SrcNone | ModRM | DstMem | Mov,0 , - SrcMem16 | ModRM | Mov, SrcMem | ModRM | ByteOp, + SrcMem16 | ModRM | Mov | Priv, SrcMem | ModRM | ByteOp | Priv, [Group8*8 ] =0 ,0 ,0 ,0 , DstMem | SrcImmByte | ModRM, DstMem | SrcImmByte | ModRM,
@@ -335,7 +340,7 @@ static u32 group_table[] = {static u32 group2_table[] = { [Group7*8 ] = - SrcNone | ModRM,0 ,0 , SrcNone | ModRM, + SrcNone | ModRM | Priv,0 ,0 , SrcNone | ModRM, SrcNone | ModRM | DstMem | Mov,0 , SrcMem16 | ModRM | Mov,0 , [Group9*8] =
@@ -1700,12 +1705,6 @@ emulate_sysexit(struct x86_emulate_ctxt *ctxt)return -1 ; } -/* sysexit must be called from CPL 0 */ -if (kvm_x86_ops->get_cpl (ctxt->vcpu) !=0 ) { -kvm_inject_gp (ctxt->vcpu,0 ); -return -1 ; - } -setup_syscalls_segments (ctxt, &cs, &ss);if ((c->rex_prefix &0x8 ) !=0x0 )
@@ -1820,6 +1819,12 @@ x86_emulate_insn(struct x86_emulate_ctxt *ctxt, struct x86_emulate_ops *ops)memcpy (c->regs, ctxt->vcpu->arch.regs,sizeof c->regs); saved_eip = c->eip; +/* Privileged instruction can be executed only in CPL=0 */ +if ((c->d & Priv) && kvm_x86_ops->get_cpl (ctxt->vcpu)) { +kvm_inject_gp (ctxt->vcpu,0 ); + goto done; + } +if (((c->d & ModRM) && (c->modrm_mod !=3 )) || (c->d & MemAbs)) memop = c->modrm_ea;
Signature · 1 line
1.6.5
PATCH v2 8/8 KVM: Add LOCK prefix validity checking.
In reply to Gleb NatapovInstructions which are not allowed to have LOCK prefix should generate #UD if one is used.
--- arch/x86/kvm/emulate.c | 85 +++++++++++++++++++++++++++--------------------- 1 files changed, 48 insertions(+), 37 deletions(-)
arch/x86/kvm/emulate.c +48 -37
@@ -76,6 +76,7 @@#define GroupDual (1<<15)/* Alternate decoding of mod == 3 */ #define GroupMask 0xff/* Group number stored in bits 0:7 */ /* Misc flags */ +#define Lock (1<<26)/* lock prefix is allowed for the instruction */ #define Priv (1<<27)/* instruction generates #GP if current CPL != 0 */ #define No64 (1<<28)/* Source 2 operand type */
@@ -94,35 +95,35 @@ enum {static u32 opcode_table[256 ] = {/* 0x00 - 0x07 */ - ByteOp | DstMem | SrcReg | ModRM, DstMem | SrcReg | ModRM, + ByteOp | DstMem | SrcReg | ModRM | Lock, DstMem | SrcReg | ModRM | Lock, ByteOp | DstReg | SrcMem | ModRM, DstReg | SrcMem | ModRM, ByteOp | DstAcc | SrcImm, DstAcc | SrcImm, ImplicitOps | Stack | No64, ImplicitOps | Stack | No64,/* 0x08 - 0x0F */ - ByteOp | DstMem | SrcReg | ModRM, DstMem | SrcReg | ModRM, + ByteOp | DstMem | SrcReg | ModRM | Lock, DstMem | SrcReg | ModRM | Lock, ByteOp | DstReg | SrcMem | ModRM, DstReg | SrcMem | ModRM, ByteOp | DstAcc | SrcImm, DstAcc | SrcImm, ImplicitOps | Stack | No64,0 ,/* 0x10 - 0x17 */ - ByteOp | DstMem | SrcReg | ModRM, DstMem | SrcReg | ModRM, + ByteOp | DstMem | SrcReg | ModRM | Lock, DstMem | SrcReg | ModRM | Lock, ByteOp | DstReg | SrcMem | ModRM, DstReg | SrcMem | ModRM, ByteOp | DstAcc | SrcImm, DstAcc | SrcImm, ImplicitOps | Stack | No64, ImplicitOps | Stack | No64,/* 0x18 - 0x1F */ - ByteOp | DstMem | SrcReg | ModRM, DstMem | SrcReg | ModRM, + ByteOp | DstMem | SrcReg | ModRM | Lock, DstMem | SrcReg | ModRM | Lock, ByteOp | DstReg | SrcMem | ModRM, DstReg | SrcMem | ModRM, ByteOp | DstAcc | SrcImm, DstAcc | SrcImm, ImplicitOps | Stack | No64, ImplicitOps | Stack | No64,/* 0x20 - 0x27 */ - ByteOp | DstMem | SrcReg | ModRM, DstMem | SrcReg | ModRM, + ByteOp | DstMem | SrcReg | ModRM | Lock, DstMem | SrcReg | ModRM | Lock, ByteOp | DstReg | SrcMem | ModRM, DstReg | SrcMem | ModRM, DstAcc | SrcImmByte, DstAcc | SrcImm,0 ,0 ,/* 0x28 - 0x2F */ - ByteOp | DstMem | SrcReg | ModRM, DstMem | SrcReg | ModRM, + ByteOp | DstMem | SrcReg | ModRM | Lock, DstMem | SrcReg | ModRM | Lock, ByteOp | DstReg | SrcMem | ModRM, DstReg | SrcMem | ModRM,0 ,0 ,0 ,0 ,/* 0x30 - 0x37 */ - ByteOp | DstMem | SrcReg | ModRM, DstMem | SrcReg | ModRM, + ByteOp | DstMem | SrcReg | ModRM | Lock, DstMem | SrcReg | ModRM | Lock, ByteOp | DstReg | SrcMem | ModRM, DstReg | SrcMem | ModRM,0 ,0 ,0 ,0 ,/* 0x38 - 0x3F */
@@ -158,7 +159,7 @@ static u32 opcode_table[256] = { Group | Group1_80, Group | Group1_81, Group | Group1_82, Group | Group1_83, ByteOp | DstMem | SrcReg | ModRM, DstMem | SrcReg | ModRM, - ByteOp | DstMem | SrcReg | ModRM, DstMem | SrcReg | ModRM, + ByteOp | DstMem | SrcReg | ModRM | Lock, DstMem | SrcReg | ModRM | Lock,/* 0x88 - 0x8F */ ByteOp | DstMem | SrcReg | ModRM | Mov, DstMem | SrcReg | ModRM | Mov, ByteOp | DstReg | SrcMem | ModRM | Mov, DstReg | SrcMem | ModRM | Mov,
@@ -263,17 +264,18 @@ static u32 twobyte_table[256] = { DstMem | SrcReg | Src2CL | ModRM,0 ,0 ,/* 0xA8 - 0xAF */ ImplicitOps | Stack, ImplicitOps | Stack, -0 , DstMem | SrcReg | ModRM | BitOp, +0 , DstMem | SrcReg | ModRM | BitOp | Lock, DstMem | SrcReg | Src2ImmByte | ModRM, DstMem | SrcReg | Src2CL | ModRM, ModRM,0 ,/* 0xB0 - 0xB7 */ - ByteOp | DstMem | SrcReg | ModRM, DstMem | SrcReg | ModRM,0 , - DstMem | SrcReg | ModRM | BitOp, + ByteOp | DstMem | SrcReg | ModRM | Lock, DstMem | SrcReg | ModRM | Lock, +0 , DstMem | SrcReg | ModRM | BitOp | Lock,0 ,0 , ByteOp | DstReg | SrcMem | ModRM | Mov, DstReg | SrcMem16 | ModRM | Mov,/* 0xB8 - 0xBF */ -0 ,0 , Group | Group8, DstMem | SrcReg | ModRM | BitOp, +0 ,0 , + Group | Group8, DstMem | SrcReg | ModRM | BitOp | Lock,0 ,0 , ByteOp | DstReg | SrcMem | ModRM | Mov, DstReg | SrcMem16 | ModRM | Mov, /* 0xC0 - 0xCF */
@@ -290,25 +292,37 @@ static u32 twobyte_table[256] = {static u32 group_table[] = { [Group1_80*8 ] = - ByteOp | DstMem | SrcImm | ModRM, ByteOp | DstMem | SrcImm | ModRM, - ByteOp | DstMem | SrcImm | ModRM, ByteOp | DstMem | SrcImm | ModRM, - ByteOp | DstMem | SrcImm | ModRM, ByteOp | DstMem | SrcImm | ModRM, - ByteOp | DstMem | SrcImm | ModRM, ByteOp | DstMem | SrcImm | ModRM, + ByteOp | DstMem | SrcImm | ModRM | Lock, + ByteOp | DstMem | SrcImm | ModRM | Lock, + ByteOp | DstMem | SrcImm | ModRM | Lock, + ByteOp | DstMem | SrcImm | ModRM | Lock, + ByteOp | DstMem | SrcImm | ModRM | Lock, + ByteOp | DstMem | SrcImm | ModRM | Lock, + ByteOp | DstMem | SrcImm | ModRM | Lock, + ByteOp | DstMem | SrcImm | ModRM, [Group1_81*8 ] = - DstMem | SrcImm | ModRM, DstMem | SrcImm | ModRM, - DstMem | SrcImm | ModRM, DstMem | SrcImm | ModRM, - DstMem | SrcImm | ModRM, DstMem | SrcImm | ModRM, - DstMem | SrcImm | ModRM, DstMem | SrcImm | ModRM, + DstMem | SrcImm | ModRM | Lock, + DstMem | SrcImm | ModRM | Lock, + DstMem | SrcImm | ModRM | Lock, + DstMem | SrcImm | ModRM | Lock, + DstMem | SrcImm | ModRM | Lock, + DstMem | SrcImm | ModRM | Lock, + DstMem | SrcImm | ModRM | Lock, + DstMem | SrcImm | ModRM, [Group1_82*8 ] = ByteOp | DstMem | SrcImm | ModRM, ByteOp | DstMem | SrcImm | ModRM, ByteOp | DstMem | SrcImm | ModRM, ByteOp | DstMem | SrcImm | ModRM, ByteOp | DstMem | SrcImm | ModRM, ByteOp | DstMem | SrcImm | ModRM, ByteOp | DstMem | SrcImm | ModRM, ByteOp | DstMem | SrcImm | ModRM, [Group1_83*8 ] = - DstMem | SrcImmByte | ModRM, DstMem | SrcImmByte | ModRM, - DstMem | SrcImmByte | ModRM, DstMem | SrcImmByte | ModRM, - DstMem | SrcImmByte | ModRM, DstMem | SrcImmByte | ModRM, - DstMem | SrcImmByte | ModRM, DstMem | SrcImmByte | ModRM, + DstMem | SrcImmByte | ModRM | Lock, + DstMem | SrcImmByte | ModRM | Lock, + DstMem | SrcImmByte | ModRM | Lock, + DstMem | SrcImmByte | ModRM | Lock, + DstMem | SrcImmByte | ModRM | Lock, + DstMem | SrcImmByte | ModRM | Lock, + DstMem | SrcImmByte | ModRM | Lock, + DstMem | SrcImmByte | ModRM, [Group1A*8 ] = DstMem | SrcNone | ModRM | Mov | Stack,0 ,0 ,0 ,0 ,0 ,0 ,0 , [Group3_Byte*8] =
@@ -332,10 +346,10 @@ static u32 group_table[] = { SrcMem16 | ModRM | Mov | Priv, SrcMem | ModRM | ByteOp | Priv, [Group8*8 ] =0 ,0 ,0 ,0 , - DstMem | SrcImmByte | ModRM, DstMem | SrcImmByte | ModRM, - DstMem | SrcImmByte | ModRM, DstMem | SrcImmByte | ModRM, + DstMem | SrcImmByte | ModRM, DstMem | SrcImmByte | ModRM | Lock, + DstMem | SrcImmByte | ModRM | Lock, DstMem | SrcImmByte | ModRM | Lock, [Group9*8 ] = - 0, ImplicitOps | ModRM, 0, 0, 0, 0, 0, 0, + 0, ImplicitOps | ModRM | Lock, 0, 0, 0, 0, 0, 0, }; static u32 group2_table[] = {
@@ -1580,8 +1594,7 @@ emulate_syscall(struct x86_emulate_ctxt *ctxt)u64 msr_data;/* syscall is not available in real mode */ -if (c->lock_prefix || ctxt->mode ==X86EMUL_MODE_REAL - || ctxt->mode ==X86EMUL_MODE_VM86 ) +if (ctxt->mode ==X86EMUL_MODE_REAL || ctxt->mode ==X86EMUL_MODE_VM86 )return -1 ;setup_syscalls_segments (ctxt, &cs, &ss);
@@ -1629,10 +1642,6 @@ emulate_sysenter(struct x86_emulate_ctxt *ctxt)struct kvm_segment cs, ss;u64 msr_data; -/* inject #UD if LOCK prefix is used */ -if (c->lock_prefix) -return -1 ; -/* inject #GP if in real mode */ if (ctxt->mode ==X86EMUL_MODE_REAL ) {kvm_inject_gp (ctxt->vcpu,0 );
@@ -1694,10 +1703,6 @@ emulate_sysexit(struct x86_emulate_ctxt *ctxt)u64 msr_data;int usermode; -/* inject #UD if LOCK prefix is used */ -if (c->lock_prefix) -return -1 ; -/* inject #GP if in real mode or Virtual 8086 mode */ if (ctxt->mode ==X86EMUL_MODE_REAL || ctxt->mode ==X86EMUL_MODE_VM86 ) {
@@ -1819,6 +1824,12 @@ x86_emulate_insn(struct x86_emulate_ctxt *ctxt, struct x86_emulate_ops *ops)memcpy (c->regs, ctxt->vcpu->arch.regs,sizeof c->regs); saved_eip = c->eip; +/* LOCK prefix is allowed only with some instructions */ +if (c->lock_prefix && !(c->d & Lock)) { +kvm_queue_exception (ctxt->vcpu,UD_VECTOR ); + goto done; + } +/* Privileged instruction can be executed only in CPL=0 */ if ((c->d & Priv) && kvm_x86_ops->get_cpl (ctxt->vcpu)) {kvm_inject_gp (ctxt->vcpu,0 );
Signature · 1 line
1.6.5
Avi Kivity
AppliedQuoted 4 lines · Gleb Natapov
X86 emulator fails to do permission/correctness checking like real CPU does for some instruction. This patch series fixes some of those discrepancies.
Applied all, thanks.
Signature · 1 line
error compiling committee.c: too many arguments to function
Quoted 9 lines · Gleb Natapov
X86 emulator fails to do permission/correctness checking like real CPU does for some instruction. This patch series fixes some of those discrepancies.
Changelog:
v1->v2
- move IOPL permission checking functions intoemulate.c
- rename them to more intuitive names
- fix tr segment limit checking
This whole series should go for -stable, no?
Alex
Quoted 7 lines · Alexander Graf
Quoted 4 lines · Gleb Natapov
X86 emulator fails to do permission/correctness checking like real CPU does for some instruction. This patch series fixes some of those discrepancies.
Quoted 7 lines
Quoted 5 lines
Changelog:
v1->v2
- move IOPL permission checking functions intoemulate.c
- rename them to more intuitive names
- fix tr segment limit checkingThis whole series should go for -stable, no?
That's what I get for blindly commenting stuff. Nvm.
Alex