x86/HVM: correct segment register loading during task switch Instead of #NP, #SS needs to be raised for a non-present %ss descriptor. Don't lose the low two selector bits on null selector loads. Signed-off-by: Jan Beulich --- This basically mirrors https://lists.xenproject.org/archives/html/xen-devel/2016-09/msg02198.html taking into account that there's no 64-bit mode case here. --- a/xen/arch/x86/hvm/hvm.c +++ b/xen/arch/x86/hvm/hvm.c @@ -2723,6 +2723,7 @@ static int hvm_load_segment_selector( if ( (seg == x86_seg_cs) || (seg == x86_seg_ss) ) goto fail; memset(&segr, 0, sizeof(segr)); + segr.sel = sel; hvm_set_segment_register(v, seg, &segr); return 0; } @@ -2749,7 +2750,8 @@ static int hvm_load_segment_selector( /* Segment present in memory? */ if ( !(desc.b & _SEGMENT_P) ) { - fault_type = TRAP_no_segment; + fault_type = (seg != x86_seg_ss) ? TRAP_no_segment + : TRAP_stack_error; goto unmap_and_fail; }