From: Andrew Oates Date: Thu, 16 Aug 2018 01:19:03 +0000 (-0400) Subject: target-i386: fix segment limit check in ljmp X-Git-Tag: v3.1.0-rc0~119^2~34 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=db7196db5d5d932f388643baae6835f8dcda6921;p=thirdparty%2Fqemu.git target-i386: fix segment limit check in ljmp The current implementation has three bugs, * segment limits are not enforced in protected mode if the L bit is set in the target segment descriptor * segment limits are not enforced in compatibility mode (ljmp to 32-bit code segment in long mode) * #GP(new_cs) is generated rather than #GP(0) Now the segment limits are enforced if we're not in long mode OR the target code segment doesn't have the L bit set. Signed-off-by: Andrew Oates Message-Id: <20180816011903.39816-1-andrew@andrewoates.com> Signed-off-by: Paolo Bonzini --- diff --git a/target/i386/seg_helper.c b/target/i386/seg_helper.c index b2adddcd7fa..d1cbc6ebf0d 100644 --- a/target/i386/seg_helper.c +++ b/target/i386/seg_helper.c @@ -1633,8 +1633,8 @@ void helper_ljmp_protected(CPUX86State *env, int new_cs, target_ulong new_eip, } limit = get_seg_limit(e1, e2); if (new_eip > limit && - !(env->hflags & HF_LMA_MASK) && !(e2 & DESC_L_MASK)) { - raise_exception_err_ra(env, EXCP0D_GPF, new_cs & 0xfffc, GETPC()); + (!(env->hflags & HF_LMA_MASK) || !(e2 & DESC_L_MASK))) { + raise_exception_err_ra(env, EXCP0D_GPF, 0, GETPC()); } cpu_x86_load_seg_cache(env, R_CS, (new_cs & 0xfffc) | cpl, get_seg_base(e1, e2), limit, e2);