Commit 0888d36bb2 ("x86/emul: Correct the decoding of SReg3 operands")
overlooked three places where x86_seg_cs was assumed to be zero.
Signed-off-by: Jan Beulich
Reviewed-by: Andrew Cooper
Release-acked-by: Wei Liu
---
v2: Add BUILD_BUG_ON() and use ARRAY_SIZE(reg) as loop bound.
--- a/xen/arch/x86/hvm/vmx/vmx.c
+++ b/xen/arch/x86/hvm/vmx/vmx.c
@@ -1496,21 +1496,23 @@ static void vmx_update_guest_cr(struct v
enum x86_segment s;
struct segment_register reg[x86_seg_tr + 1];
+BUILD_BUG_ON(x86_seg_tr != x86_seg_gs + 1);
+
/* Entering or leaving real mode: adjust the segment registers.
* Need to read them all either way, as realmode reads can update
* the saved values we'll use when returning to prot mode. */
-for ( s = x86_seg_cs ; s <= x86_seg_tr ; s++ )
+for ( s = 0; s < ARRAY_SIZE(reg); s++ )
vmx_get_segment_register(v, s, ®[s]);
v->arch.hvm_vmx.vmx_realmode = realmode;
if ( realmode )
{
-for ( s = x86_seg_cs ; s <= x86_seg_tr ; s++ )
+for ( s = 0; s < ARRAY_SIZE(reg); s++ )
vmx_set_segment_register(v, s, ®[s]);
}
else
{
-for ( s = x86_seg_cs ; s <= x86_seg_tr ; s++ )
+for ( s = 0; s < ARRAY_SIZE(reg); s++ )
if ( !(v->arch.hvm_vmx.vm86_segment_mask & (1arch.hvm_vmx.vmx_realmode = realmode;
if ( realmode )
{
-for ( s = x86_seg_cs ; s <= x86_seg_tr ; s++ )
+for ( s = 0; s < ARRAY_SIZE(reg); s++ )
vmx_set_segment_register(v, s, ®[s]);
}
else
{
-for ( s = x86_seg_cs ; s <= x86_seg_tr ; s++ )
+for ( s = 0; s < ARRAY_SIZE(reg); s++ )
if ( !(v->arch.hvm_vmx.vm86_segment_mask & (1
