target/i386: seg_helper: Correct segement selector nullification in the RET/IRET helper
PATCH 1/1 target/i386: seg_helper: Correct segement selector nullification in the RET/IRET helper
From: Bin Meng <[email protected]>
Per the SDM, when returning to outer privilege level, for segment registers (ES, FS, GS, and DS) if the check fails, the segment selector becomes null, but QEMU clears the base/limit/flags as well as nullifying the segment selector, which should be a spec violation.
Real hardware seems to be compliant with the spec, at least on one Coffee Lake board I tested.
---
target/i386/seg_helper.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-)
target/i386/seg_helper.c +4 -1
@@ -2108,7 +2108,10 @@ static inline void validate_seg(CPUX86State *env, int seg_reg, int cpl)if (!(e2 &DESC_CS_MASK ) || !(e2 &DESC_C_MASK )) {/* data or non conforming code segment */ if (dpl < cpl) { -cpu_x86_load_seg_cache (env, seg_reg,0 ,0 ,0 ,0 ); +cpu_x86_load_seg_cache (env, seg_reg,0 , + env->segs[seg_reg].base, + env->segs[seg_reg].limit, + env->segs[seg_reg].flags); } } }
Signature · 1 line
2.7.4
Quoted 8 lines · Bin Meng
From: Bin Meng <[email protected]>
Per the SDM, when returning to outer privilege level, for segment registers (ES, FS, GS, and DS) if the check fails, the segment selector becomes null, but QEMU clears the base/limit/flags as well as nullifying the segment selector, which should be a spec violation.
Quoted 9 lines
Real hardware seems to be compliant with the spec, at least on one Coffee Lake board I tested.
Signed-off-by Bin Meng <[email protected]>---
target/i386/seg_helper.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-)
Ping?
Quoted 13 lines · Bin Meng
Quoted 11 lines · Bin Meng
From: Bin Meng <[email protected]>
Per the SDM, when returning to outer privilege level, for segment registers (ES, FS, GS, and DS) if the check fails, the segment selector becomes null, but QEMU clears the base/limit/flags as well as nullifying the segment selector, which should be a spec violation.
Real hardware seems to be compliant with the spec, at least on one Coffee Lake board I tested.
Quoted 8 lines
Quoted 6 lines
Signed-off-by Bin Meng <[email protected]>---
target/i386/seg_helper.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-)Ping?
Ping?
Quoted 9 lines · Bin Meng
From: Bin Meng <[email protected]>
Per the SDM, when returning to outer privilege level, for segment registers (ES, FS, GS, and DS) if the check fails, the segment selector becomes null, but QEMU clears the base/limit/flags as well as nullifying the segment selector, which should be a spec violation.
Real hardware seems to be compliant with the spec, at least on one Coffee Lake board I tested.
This is all quite messy in QEMU; for performance reasons, it never even checks the flags on memory accesses, only on selector loads. One way to fix it would be to define five extra hflags bits that copy the P bit of DS/ES/SS/FS/GS. gen_lea_v_seg checks if the hflag is clear, and if so it generates a #GP or #SS.
Regarding your patch, I think at least the segment should be made "unusable". On Intel processors there is an internal "unusable" flag, on AMD and in QEMU, equivalently, the P bit would be cleared in the flags. As far as I know the difference is only visible with VMX.
That is, you'd need something like this:
cpu_x86_load_seg_cache(env, seg_reg, 0,
env->segs[seg_reg].base,
env->segs[seg_reg].limit,
env->segs[seg_reg].flags & ~DESC_P_MASK);Thanks,
Paolo
Quoted 24 lines
Signed-off-by Bin Meng <[email protected]>---
target/i386/seg_helper.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-)target/i386/seg_helper.c +4
-1@@ -2108,7 +2108,10 @@ static inline void validate_seg(CPUX86State *env, int seg_reg, int cpl)if (!(e2 &DESC_CS_MASK ) || !(e2 &DESC_C_MASK )) {/* data or non conforming code segment */ if (dpl < cpl) { -cpu_x86_load_seg_cache (env, seg_reg,0 ,0 ,0 ,0 ); +cpu_x86_load_seg_cache (env, seg_reg,0 , + env->segs[seg_reg].base, + env->segs[seg_reg].limit, + env->segs[seg_reg].flags); } } }