Sign Up
Log In
Log In
or
Sign Up
Places
All Projects
Status Monitor
Collapse sidebar
openSUSE:Maintenance:7390
xen.openSUSE_Leap_42.3_Update
59ae9177-x86-emul-fix-handling-of-unimplemented...
Overview
Repositories
Revisions
Requests
Users
Attributes
Meta
File 59ae9177-x86-emul-fix-handling-of-unimplemented-Grp7-insns.patch of Package xen.openSUSE_Leap_42.3_Update
# Commit 4d3f0fde471e7588ce512eaff1abdab209d8cd4b # Date 2017-09-05 12:58:47 +0100 # Author Andrew Cooper <andrew.cooper3@citrix.com> # Committer Andrew Cooper <andrew.cooper3@citrix.com> x86/emul: Fix the handling of unimplemented Grp7 instructions Grp7 is abnormally complicated to decode, even by x86's standards, with {s,l}msw being the problematic cases. Previously, any value which fell through the first switch statement (looking for instructions with entirely implicit operands) would be interpreted by the second switch statement (handling instructions with memory operands). Unimplemented instructions would then hit the #UD case for having a non-memory operand, rather than taking the cannot_emulate path. Consolidate the two switch statements into a single one, using ranges to cover the instructions with memory operands. Reported-by: Petre Pircalabu <ppircalabu@bitdefender.com> Signed-off-by: Andrew Cooper <andrew.cooper3@citrix.com> Reviewed-by: Jan Beulich <JBeulich@suse.com> --- a/xen/arch/x86/x86_emulate/x86_emulate.c +++ b/xen/arch/x86/x86_emulate/x86_emulate.c @@ -4986,9 +4986,12 @@ x86_emulate( } break; - case X86EMUL_OPC(0x0f, 0x01): /* Grp7 */ { + case X86EMUL_OPC(0x0f, 0x01): /* Grp7 */ + { unsigned long base, limit, cr0, cr0w; + seg = (modrm_reg & 1) ? x86_seg_idtr : x86_seg_gdtr; + switch( modrm ) { case 0xca: /* clac */ @@ -4999,7 +5002,7 @@ x86_emulate( _regs.eflags &= ~X86_EFLAGS_AC; if ( modrm == 0xcb ) _regs.eflags |= X86_EFLAGS_AC; - goto complete_insn; + break; #ifdef __XEN__ case 0xd1: /* xsetbv */ @@ -5011,7 +5014,7 @@ x86_emulate( handle_xsetbv(_regs.ecx, _regs.eax | (_regs.rdx << 32)), EXC_GP, 0); - goto complete_insn; + break; #endif case 0xd4: /* vmfunc */ @@ -5019,7 +5022,7 @@ x86_emulate( fail_if(!ops->vmfunc); if ( (rc = ops->vmfunc(ctxt)) != X86EMUL_OKAY ) goto done; - goto complete_insn; + break; case 0xd5: /* xend */ generate_exception_if(vex.pfx, EXC_UD); @@ -5033,7 +5036,7 @@ x86_emulate( EXC_UD); /* Neither HLE nor RTM can be active when we get here. */ _regs.eflags |= X86_EFLAGS_ZF; - goto complete_insn; + break; case 0xdf: /* invlpga */ generate_exception_if(!in_protmode(ctxt, ops), EXC_UD); @@ -5042,7 +5045,7 @@ x86_emulate( if ( (rc = ops->invlpg(x86_seg_none, truncate_ea(_regs.r(ax)), ctxt)) ) goto done; - goto complete_insn; + break; case 0xf9: /* rdtscp */ fail_if(ops->read_msr == NULL); @@ -5090,17 +5093,17 @@ x86_emulate( base += sizeof(zero); limit -= sizeof(zero); } - goto complete_insn; - } + break; } - seg = (modrm_reg & 1) ? x86_seg_idtr : x86_seg_gdtr; - - switch ( modrm_reg & 7 ) - { - case 0: /* sgdt */ - case 1: /* sidt */ - generate_exception_if(ea.type != OP_MEM, EXC_UD); +#define _GRP7(mod, reg) \ + (((mod) << 6) | ((reg) << 3)) ... (((mod) << 6) | ((reg) << 3) | 7) +#define GRP7_MEM(reg) _GRP7(0, reg): case _GRP7(1, reg): case _GRP7(2, reg) +#define GRP7_ALL(reg) GRP7_MEM(reg): case _GRP7(3, reg) + + case GRP7_MEM(0): /* sgdt */ + case GRP7_MEM(1): /* sidt */ + ASSERT(ea.type == OP_MEM); generate_exception_if(umip_active(ctxt, ops), EXC_GP, 0); fail_if(!ops->read_segment || !ops->write); if ( (rc = ops->read_segment(seg, &sreg, ctxt)) ) @@ -5118,10 +5121,11 @@ x86_emulate( op_bytes, ctxt)) != X86EMUL_OKAY ) goto done; break; - case 2: /* lgdt */ - case 3: /* lidt */ + + case GRP7_MEM(2): /* lgdt */ + case GRP7_MEM(3): /* lidt */ + ASSERT(ea.type == OP_MEM); generate_exception_if(!mode_ring0(), EXC_GP, 0); - generate_exception_if(ea.type != OP_MEM, EXC_UD); fail_if(ops->write_segment == NULL); memset(&sreg, 0, sizeof(sreg)); if ( (rc = read_ulong(ea.mem.seg, ea.mem.off+0, @@ -5137,7 +5141,8 @@ x86_emulate( if ( (rc = ops->write_segment(seg, &sreg, ctxt)) ) goto done; break; - case 4: /* smsw */ + + case GRP7_ALL(4): /* smsw */ generate_exception_if(umip_active(ctxt, ops), EXC_GP, 0); if ( ea.type == OP_MEM ) { @@ -5152,7 +5157,8 @@ x86_emulate( if ( (rc = ops->read_cr(0, &dst.val, ctxt)) ) goto done; break; - case 6: /* lmsw */ + + case GRP7_ALL(6): /* lmsw */ fail_if(ops->read_cr == NULL); fail_if(ops->write_cr == NULL); generate_exception_if(!mode_ring0(), EXC_GP, 0); @@ -5168,13 +5174,19 @@ x86_emulate( if ( (rc = ops->write_cr(0, cr0, ctxt)) ) goto done; break; - case 7: /* invlpg */ + + case GRP7_MEM(7): /* invlpg */ + ASSERT(ea.type == OP_MEM); generate_exception_if(!mode_ring0(), EXC_GP, 0); - generate_exception_if(ea.type != OP_MEM, EXC_UD); fail_if(ops->invlpg == NULL); if ( (rc = ops->invlpg(ea.mem.seg, ea.mem.off, ctxt)) ) goto done; break; + +#undef GRP7_ALL +#undef GRP7_MEM +#undef _GRP7 + default: goto cannot_emulate; }
Locations
Projects
Search
Status Monitor
Help
OpenBuildService.org
Documentation
API Documentation
Code of Conduct
Contact
Support
@OBShq
Terms
openSUSE Build Service is sponsored by
The Open Build Service is an
openSUSE project
.
Sign Up
Log In
Places
Places
All Projects
Status Monitor