mirrors-yuzu-emu/unicorn
1
0
Fork 0
mirror of https://github.com/yuzu-emu/unicorn synced 2024-11-25 13:49:13 +00:00
Code Issues Projects Releases Packages Wiki Activity

target-i386: Fixed syscall posssible segfault

Browse source 
In user-mode emulation env->idt.base memory is
allocated in linux-user/main.c with
size 8*512 = 4096 (for 64-bit).
When fake interrupt EXCP_SYSCALL is thrown
do_interrupt_user checks destination privilege level
for this fake exception, and tries to read 4 bytes
at address base + (256 * 2^4)=4096, that causes
segfault.

Privlege level was checked only for int's, so lets
read dpl from memory only for this case.

Backports commit 885b7c44e4f8b7a012a92770a0dba8b238662caa from qemu
This commit is contained in:
Stanislav Shmarov 2018-02-26 02:36:00 -05:00 committed by Lioncash
parent d8d0d08262
commit 5f9552657e
No known key found for this signature in database
GPG key ID: 4E3C3CC1031BA9C7
1 changed files with 20 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

37
qemu/target-i386/seg_helper.c
View file

@ -1137,25 +1137,28 @@ static void do_interrupt_real(CPUX86State *env, int intno, int is_int,
static void do_interrupt_user(CPUX86State *env, int intno, int is_int, static void do_interrupt_user(CPUX86State *env, int intno, int is_int,
int error_code, target_ulong next_eip) int error_code, target_ulong next_eip)
{ {
SegmentCache *dt; if (is_int) {
target_ulong ptr; SegmentCache *dt;
int dpl, cpl, shift; target_ulong ptr;
uint32_t e2; int dpl, cpl, shift;
uint32_t e2;
dt = &env->idt; dt = &env->idt;
if (env->hflags & HF_LMA_MASK) { if (env->hflags & HF_LMA_MASK) {
shift = 4; shift = 4;
} else { } else {
shift = 3; shift = 3;
} }
ptr = dt->base + (intno << shift); ptr = dt->base + (intno << shift);
e2 = cpu_ldl_kernel(env, ptr + 4); e2 = cpu_ldl_kernel(env, ptr + 4);
dpl = (e2 >> DESC_DPL_SHIFT) & 3;
cpl = env->hflags & HF_CPL_MASK; dpl = (e2 >> DESC_DPL_SHIFT) & 3;
/* check privilege if software int */ cpl = env->hflags & HF_CPL_MASK;
if (is_int && dpl < cpl) { /* check privilege if software int */
raise_exception_err(env, EXCP0D_GPF, (intno << shift) + 2); if (dpl < cpl) {
raise_exception_err(env, EXCP0D_GPF, (intno << shift) + 2);
}
} }
/* Since we emulate only user space, we cannot do more than /* Since we emulate only user space, we cannot do more than