diff options
| author | Avi Kivity <avi@redhat.com> | 2012-08-21 17:07:05 +0300 |
|---|---|---|
| committer | Marcelo Tosatti <mtosatti@redhat.com> | 2012-08-27 20:02:20 -0300 |
| commit | a5625189f6810ef79ced53989c794acfa10d3370 (patch) | |
| tree | aa496405cc5ee69b88f88228c1958cb7b51e7fa8 /arch/x86/kvm | |
| parent | 03ebebeb1ff5d1d6209fd8df4ffc9204df82bd55 (diff) | |
| download | op-kernel-dev-a5625189f6810ef79ced53989c794acfa10d3370.zip op-kernel-dev-a5625189f6810ef79ced53989c794acfa10d3370.tar.gz | |
KVM: x86 emulator: Check segment limits in real mode too
Segment limits are verified in real mode, not just protected mode.
Signed-off-by: Avi Kivity <avi@redhat.com>
Signed-off-by: Marcelo Tosatti <mtosatti@redhat.com>
Diffstat (limited to 'arch/x86/kvm')
| -rw-r--r-- | arch/x86/kvm/emulate.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/arch/x86/kvm/emulate.c b/arch/x86/kvm/emulate.c index f8b27cd..5b1c701 100644 --- a/arch/x86/kvm/emulate.c +++ b/arch/x86/kvm/emulate.c @@ -668,8 +668,6 @@ static int __linearize(struct x86_emulate_ctxt *ctxt, la = seg_base(ctxt, addr.seg) + addr.ea; switch (ctxt->mode) { - case X86EMUL_MODE_REAL: - break; case X86EMUL_MODE_PROT64: if (((signed long)la << 16) >> 16 != la) return emulate_gp(ctxt, 0); @@ -699,7 +697,10 @@ static int __linearize(struct x86_emulate_ctxt *ctxt, goto bad; } cpl = ctxt->ops->cpl(ctxt); - rpl = sel & 3; + if (ctxt->mode == X86EMUL_MODE_REAL) + rpl = 0; + else + rpl = sel & 3; cpl = max(cpl, rpl); if (!(desc.type & 8)) { /* data segment */ |
