Commit a5625189 authored by Avi Kivity's avatar Avi Kivity Committed by Marcelo Tosatti

KVM: x86 emulator: Check segment limits in real mode too

Segment limits are verified in real mode, not just protected mode.
Signed-off-by: default avatarAvi Kivity <avi@redhat.com>
Signed-off-by: default avatarMarcelo Tosatti <mtosatti@redhat.com>
parent 03ebebeb
...@@ -668,8 +668,6 @@ static int __linearize(struct x86_emulate_ctxt *ctxt, ...@@ -668,8 +668,6 @@ static int __linearize(struct x86_emulate_ctxt *ctxt,
la = seg_base(ctxt, addr.seg) + addr.ea; la = seg_base(ctxt, addr.seg) + addr.ea;
switch (ctxt->mode) { switch (ctxt->mode) {
case X86EMUL_MODE_REAL:
break;
case X86EMUL_MODE_PROT64: case X86EMUL_MODE_PROT64:
if (((signed long)la << 16) >> 16 != la) if (((signed long)la << 16) >> 16 != la)
return emulate_gp(ctxt, 0); return emulate_gp(ctxt, 0);
...@@ -699,7 +697,10 @@ static int __linearize(struct x86_emulate_ctxt *ctxt, ...@@ -699,7 +697,10 @@ static int __linearize(struct x86_emulate_ctxt *ctxt,
goto bad; goto bad;
} }
cpl = ctxt->ops->cpl(ctxt); cpl = ctxt->ops->cpl(ctxt);
rpl = sel & 3; if (ctxt->mode == X86EMUL_MODE_REAL)
rpl = 0;
else
rpl = sel & 3;
cpl = max(cpl, rpl); cpl = max(cpl, rpl);
if (!(desc.type & 8)) { if (!(desc.type & 8)) {
/* data segment */ /* data segment */
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment