Sign Up
Log In
Log In
or
Sign Up
Places
All Projects
Status Monitor
Collapse sidebar
SUSE:SLE-12-SP1:GA
xen.8005
5423e61c-x86emul-fix-SYSCALL-SYSENTER-SYSEXIT-e...
Overview
Repositories
Revisions
Requests
Users
Attributes
Meta
File 5423e61c-x86emul-fix-SYSCALL-SYSENTER-SYSEXIT-emulation.patch of Package xen.8005
# Commit 970cfb09da6704088ab12fe5014793f497d3654f # Date 2014-09-25 11:53:32 +0200 # Author Jan Beulich <jbeulich@suse.com> # Committer Jan Beulich <jbeulich@suse.com> x86emul: fix SYSCALL/SYSENTER/SYSEXIT emulation SYSCALL: - make sure SS selector has RPL 0 - only use 32 bits of RIP to fill RCX when target execution mode is 32-bit - don't shadow function wide variable 'rc' - consolidate CS attribute setting into single statements - drop pointless initializers and casts - drop redundant MSR_STAR read (as suggested by Andrew Cooper) SYSENTER/SYSEXIT: - #GP condition doesn't depend on guest mode - only use 32 bits for setting RIP/RSP when target execution mode is 32-bit - don't shadow function wide variable 'rc' - consolidate CS attribute setting into single statements - drop pointless (and inconsistently used) casts Signed-off-by: Jan Beulich <jbeulich@suse.com> Reviewed-by: Andrew Cooper <andrew.cooper3@citrix.com> Index: xen-4.4.3-testing/xen/arch/x86/x86_emulate/x86_emulate.c =================================================================== --- xen-4.4.3-testing.orig/xen/arch/x86/x86_emulate/x86_emulate.c +++ xen-4.4.3-testing/xen/arch/x86/x86_emulate/x86_emulate.c @@ -3788,8 +3788,7 @@ x86_emulate( case 0x05: /* syscall */ { uint64_t msr_content; - struct segment_register cs = { 0 }, ss = { 0 }; - int rc; + struct segment_register cs, ss; generate_exception_if(in_realmode(ctxt, ops), EXC_UD, -1); generate_exception_if(!in_protmode(ctxt, ops), EXC_UD, -1); @@ -3803,13 +3802,11 @@ x86_emulate( if ( (rc = ops->read_msr(MSR_STAR, &msr_content, ctxt)) != 0 ) goto done; - msr_content >>= 32; - cs.sel = (uint16_t)(msr_content & 0xfffc); - ss.sel = (uint16_t)(msr_content + 8); + cs.sel = (msr_content >> 32) & ~3; /* SELECTOR_RPL_MASK */ + ss.sel = cs.sel + 8; cs.base = ss.base = 0; /* flat segment */ cs.limit = ss.limit = ~0u; /* 4GB limit */ - cs.attr.bytes = 0xc9b; /* G+DB+P+S+Code */ ss.attr.bytes = 0xc93; /* G+DB+P+S+Data */ #ifdef __x86_64__ @@ -3818,8 +3815,7 @@ x86_emulate( goto cannot_emulate; if ( rc ) { - cs.attr.fields.db = 0; - cs.attr.fields.l = 1; + cs.attr.bytes = 0xa9b; /* L+DB+P+S+Code */ _regs.rcx = _regs.rip; _regs.r11 = _regs.eflags & ~EFLG_RF; @@ -3836,10 +3832,9 @@ x86_emulate( else #endif { - if ( (rc = ops->read_msr(MSR_STAR, &msr_content, ctxt)) != 0 ) - goto done; + cs.attr.bytes = 0xc9b; /* G+DB+P+S+Code */ - _regs.ecx = _regs.eip; + _regs.ecx = (uint32_t)_regs.eip; _regs.eip = (uint32_t)msr_content; _regs.eflags &= ~(EFLG_VM | EFLG_IF | EFLG_RF); } @@ -4031,7 +4026,7 @@ x86_emulate( case 0x34: /* sysenter */ { uint64_t msr_content; struct segment_register cs, ss; - int rc; + int lm; generate_exception_if(mode_ring0(), EXC_GP, 0); generate_exception_if(in_realmode(ctxt, ops), EXC_GP, 0); @@ -4041,34 +4036,26 @@ x86_emulate( if ( (rc = ops->read_msr(MSR_SYSENTER_CS, &msr_content, ctxt)) != 0 ) goto done; - if ( mode_64bit() ) - generate_exception_if(msr_content == 0, EXC_GP, 0); - else - generate_exception_if((msr_content & 0xfffc) == 0, EXC_GP, 0); + generate_exception_if(!(msr_content & 0xfffc), EXC_GP, 0); + lm = in_longmode(ctxt, ops); + if ( lm < 0 ) + goto cannot_emulate; _regs.eflags &= ~(EFLG_VM | EFLG_IF | EFLG_RF); fail_if(ops->read_segment == NULL); ops->read_segment(x86_seg_cs, &cs, ctxt); - cs.sel = (uint16_t)msr_content & ~3; /* SELECTOR_RPL_MASK */ + cs.sel = msr_content & ~3; /* SELECTOR_RPL_MASK */ cs.base = 0; /* flat segment */ cs.limit = ~0u; /* 4GB limit */ - cs.attr.bytes = 0xc9b; /* G+DB+P+S+Code */ + cs.attr.bytes = lm ? 0xa9b /* L+DB+P+S+Code */ + : 0xc9b; /* G+DB+P+S+Code */ ss.sel = cs.sel + 8; ss.base = 0; /* flat segment */ ss.limit = ~0u; /* 4GB limit */ ss.attr.bytes = 0xc93; /* G+DB+P+S+Data */ - rc = in_longmode(ctxt, ops); - if ( rc < 0 ) - goto cannot_emulate; - if ( rc ) - { - cs.attr.fields.db = 0; - cs.attr.fields.l = 1; - } - fail_if(ops->write_segment == NULL); if ( (rc = ops->write_segment(x86_seg_cs, &cs, ctxt)) != 0 || (rc = ops->write_segment(x86_seg_ss, &ss, ctxt)) != 0 ) @@ -4076,11 +4063,11 @@ x86_emulate( if ( (rc = ops->read_msr(MSR_SYSENTER_EIP, &msr_content, ctxt)) != 0 ) goto done; - _regs.eip = msr_content; + _regs.eip = lm ? msr_content : (uint32_t)msr_content; if ( (rc = ops->read_msr(MSR_SYSENTER_ESP, &msr_content, ctxt)) != 0 ) goto done; - _regs.esp = msr_content; + _regs.esp = lm ? msr_content : (uint32_t)msr_content; break; } @@ -4089,7 +4076,6 @@ x86_emulate( uint64_t msr_content; struct segment_register cs, ss; bool_t user64 = !!(rex_prefix & REX_W); - int rc; generate_exception_if(!mode_ring0(), EXC_GP, 0); generate_exception_if(in_realmode(ctxt, ops), EXC_GP, 0); @@ -4099,42 +4085,27 @@ x86_emulate( if ( (rc = ops->read_msr(MSR_SYSENTER_CS, &msr_content, ctxt)) != 0 ) goto done; - if ( user64 ) - { - cs.sel = (uint16_t)(msr_content + 32); - ss.sel = (cs.sel + 8); - generate_exception_if(msr_content == 0, EXC_GP, 0); - } - else - { - cs.sel = (uint16_t)(msr_content + 16); - ss.sel = (uint16_t)(msr_content + 24); - generate_exception_if((msr_content & 0xfffc) == 0, EXC_GP, 0); - } + generate_exception_if(!(msr_content & 0xfffc), EXC_GP, 0); - cs.sel |= 0x3; /* SELECTOR_RPL_MASK */ + cs.sel = (msr_content | 3) + /* SELECTOR_RPL_MASK */ + (user64 ? 32 : 16); cs.base = 0; /* flat segment */ cs.limit = ~0u; /* 4GB limit */ - cs.attr.bytes = 0xcfb; /* G+DB+P+DPL3+S+Code */ + cs.attr.bytes = user64 ? 0xafb /* L+DB+P+DPL3+S+Code */ + : 0xcfb; /* G+DB+P+DPL3+S+Code */ - ss.sel |= 0x3; /* SELECTOR_RPL_MASK */ + ss.sel = cs.sel + 8; ss.base = 0; /* flat segment */ ss.limit = ~0u; /* 4GB limit */ ss.attr.bytes = 0xcf3; /* G+DB+P+DPL3+S+Data */ - if ( user64 ) - { - cs.attr.fields.db = 0; - cs.attr.fields.l = 1; - } - fail_if(ops->write_segment == NULL); if ( (rc = ops->write_segment(x86_seg_cs, &cs, ctxt)) != 0 || (rc = ops->write_segment(x86_seg_ss, &ss, ctxt)) != 0 ) goto done; - _regs.eip = _regs.edx; - _regs.esp = _regs.ecx; + _regs.eip = user64 ? _regs.edx : (uint32_t)_regs.edx; + _regs.esp = user64 ? _regs.ecx : (uint32_t)_regs.ecx; break; }
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
