lazymio/unicorn
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

(Fix #341) SYSENTER instruction is not properly hooked with uc_hook_add in x86 emulation.

Browse Source 
helper_sysenter in qemu/target-i386/seg_helper.c didn't check properly if a call interrupt callback was registred.
It has been fixed by copying the helper_syscall behavior.
This commit is contained in:
Spl3en
2015-12-24 16:00:22 +01:00
parent ed319bda0b
commit 4c3ad139ea
4 changed files with 77 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
qemu/target-i386/seg_helper.c
View File

@@ -2301,8 +2301,18 @@ void helper_lret_protected(CPUX86State *env, int shift, int addend)
helper_ret_protected(env, shift, 0, addend);
}
void helper_sysenter(CPUX86State *env)
void helper_sysenter(CPUX86State *env, int next_eip_addend)
{
// Unicorn: call interrupt callback if registered
struct uc_struct *uc = env->uc;
if (uc->hook_syscall_idx) {
((uc_cb_insn_syscall_t)uc->hook_callbacks[uc->hook_syscall_idx].callback)(
uc, uc->hook_callbacks[uc->hook_syscall_idx].user_data);
}
env->eip += next_eip_addend;
return;
if (env->sysenter_cs == 0) {
raise_exception_err(env, EXCP0D_GPF, 0);
}