|
@@ -2033,6 +2033,7 @@ static int em_ret_far(struct x86_emulate_ctxt *ctxt)
|
|
{
|
|
{
|
|
int rc;
|
|
int rc;
|
|
unsigned long cs;
|
|
unsigned long cs;
|
|
|
|
+ int cpl = ctxt->ops->cpl(ctxt);
|
|
|
|
|
|
rc = emulate_pop(ctxt, &ctxt->_eip, ctxt->op_bytes);
|
|
rc = emulate_pop(ctxt, &ctxt->_eip, ctxt->op_bytes);
|
|
if (rc != X86EMUL_CONTINUE)
|
|
if (rc != X86EMUL_CONTINUE)
|
|
@@ -2042,6 +2043,9 @@ static int em_ret_far(struct x86_emulate_ctxt *ctxt)
|
|
rc = emulate_pop(ctxt, &cs, ctxt->op_bytes);
|
|
rc = emulate_pop(ctxt, &cs, ctxt->op_bytes);
|
|
if (rc != X86EMUL_CONTINUE)
|
|
if (rc != X86EMUL_CONTINUE)
|
|
return rc;
|
|
return rc;
|
|
|
|
+ /* Outer-privilege level return is not implemented */
|
|
|
|
+ if (ctxt->mode >= X86EMUL_MODE_PROT16 && (cs & 3) > cpl)
|
|
|
|
+ return X86EMUL_UNHANDLEABLE;
|
|
rc = load_segment_descriptor(ctxt, (u16)cs, VCPU_SREG_CS);
|
|
rc = load_segment_descriptor(ctxt, (u16)cs, VCPU_SREG_CS);
|
|
return rc;
|
|
return rc;
|
|
}
|
|
}
|