Commit ca85f002 authored by Hou Wenlong's avatar Hou Wenlong Committed by Paolo Bonzini

KVM: x86/emulator: Defer not-present segment check in __load_segment_descriptor()

Per Intel's SDM on the "Instruction Set Reference", when
loading segment descriptor, not-present segment check should
be after all type and privilege checks. But the emulator checks
it first, then #NP is triggered instead of #GP if privilege fails
and segment is not present. Put not-present segment check after
type and privilege checks in __load_segment_descriptor().

Fixes: 38ba30ba (KVM: x86 emulator: Emulate task switch in emulator.c)
Reviewed-by: default avatarSean Christopherson <seanjc@google.com>
Signed-off-by: default avatarHou Wenlong <houwenlong.hwl@antgroup.com>
Message-Id: <52573c01d369f506cadcf7233812427cf7db81a7.1644292363.git.houwenlong.hwl@antgroup.com>
Signed-off-by: default avatarPaolo Bonzini <pbonzini@redhat.com>
parent 85c68eb4
...@@ -1608,11 +1608,6 @@ static int __load_segment_descriptor(struct x86_emulate_ctxt *ctxt, ...@@ -1608,11 +1608,6 @@ static int __load_segment_descriptor(struct x86_emulate_ctxt *ctxt,
goto exception; goto exception;
} }
if (!seg_desc.p) {
err_vec = (seg == VCPU_SREG_SS) ? SS_VECTOR : NP_VECTOR;
goto exception;
}
dpl = seg_desc.dpl; dpl = seg_desc.dpl;
switch (seg) { switch (seg) {
...@@ -1652,6 +1647,10 @@ static int __load_segment_descriptor(struct x86_emulate_ctxt *ctxt, ...@@ -1652,6 +1647,10 @@ static int __load_segment_descriptor(struct x86_emulate_ctxt *ctxt,
case VCPU_SREG_TR: case VCPU_SREG_TR:
if (seg_desc.s || (seg_desc.type != 1 && seg_desc.type != 9)) if (seg_desc.s || (seg_desc.type != 1 && seg_desc.type != 9))
goto exception; goto exception;
if (!seg_desc.p) {
err_vec = NP_VECTOR;
goto exception;
}
old_desc = seg_desc; old_desc = seg_desc;
seg_desc.type |= 2; /* busy */ seg_desc.type |= 2; /* busy */
ret = ctxt->ops->cmpxchg_emulated(ctxt, desc_addr, &old_desc, &seg_desc, ret = ctxt->ops->cmpxchg_emulated(ctxt, desc_addr, &old_desc, &seg_desc,
...@@ -1676,6 +1675,11 @@ static int __load_segment_descriptor(struct x86_emulate_ctxt *ctxt, ...@@ -1676,6 +1675,11 @@ static int __load_segment_descriptor(struct x86_emulate_ctxt *ctxt,
break; break;
} }
if (!seg_desc.p) {
err_vec = (seg == VCPU_SREG_SS) ? SS_VECTOR : NP_VECTOR;
goto exception;
}
if (seg_desc.s) { if (seg_desc.s) {
/* mark segment as accessed */ /* mark segment as accessed */
if (!(seg_desc.type & 1)) { if (!(seg_desc.type & 1)) {
......
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