diff options
| author | Keir Fraser <keir.fraser@citrix.com> | 2009-08-07 09:54:43 +0100 |
|---|---|---|
| committer | Keir Fraser <keir.fraser@citrix.com> | 2009-08-07 09:54:43 +0100 |
| commit | 26fd181703c557965d06739e1a0292cea7088ea9 (patch) | |
| tree | 25eb52504d41db08316a1ee2196b3373a032ec2b /xen/arch/x86/x86_emulate | |
| parent | 990e56e3ecccec492ea73dcac96feae0d1f3f358 (diff) | |
| download | xen-26fd181703c557965d06739e1a0292cea7088ea9.tar.gz xen-26fd181703c557965d06739e1a0292cea7088ea9.tar.bz2 xen-26fd181703c557965d06739e1a0292cea7088ea9.zip | |
x86_emulate: protmode_load_seg() cannot load system segments in long mode.
Signed-off-by: Keir Fraser <keir.fraser@citrix.com>
Diffstat (limited to 'xen/arch/x86/x86_emulate')
| -rw-r--r-- | xen/arch/x86/x86_emulate/x86_emulate.c | 13 |
1 files changed, 11 insertions, 2 deletions
diff --git a/xen/arch/x86/x86_emulate/x86_emulate.c b/xen/arch/x86/x86_emulate/x86_emulate.c index de14199b1f..8fa5fd400b 100644 --- a/xen/arch/x86/x86_emulate/x86_emulate.c +++ b/xen/arch/x86/x86_emulate/x86_emulate.c @@ -1037,8 +1037,17 @@ protmode_load_seg( goto raise_exn; } - /* System segments must have the system flag (S) set. */ - if ( (desc.b & (1u<<12)) == (!is_x86_user_segment(seg) << 12) ) + if ( !is_x86_user_segment(seg) ) + { + /* System segments must have S flag == 0. */ + if ( desc.b & (1u << 12) ) + goto raise_exn; + /* We do not support 64-bit descriptor types. */ + if ( in_longmode(ctxt, ops) ) + return X86EMUL_UNHANDLEABLE; + } + /* User segments must have S flag == 1. */ + else if ( !(desc.b & (1u << 12)) ) goto raise_exn; dpl = (desc.b >> 13) & 3; |