diff options
| author | ptitSeb <sebastien.chev@gmail.com> | 2024-11-16 12:16:36 +0100 |
|---|---|---|
| committer | ptitSeb <sebastien.chev@gmail.com> | 2024-11-16 12:16:51 +0100 |
| commit | bc8c786b803c6e0492dea15911dd6512a785f2de (patch) | |
| tree | 72bcee592bcc13bc5bcdff4255264befbf06e0a7 /src/libtools | |
| parent | 5ab8a6f6f4dd8cfce669963571f401e632f66769 (diff) | |
| download | box64-bc8c786b803c6e0492dea15911dd6512a785f2de.tar.gz box64-bc8c786b803c6e0492dea15911dd6512a785f2de.zip | |
Smal adjustment in singal handling for no-execution error
Diffstat (limited to 'src/libtools')
| -rw-r--r-- | src/libtools/signal32.c | 9 | ||||
| -rw-r--r-- | src/libtools/signals.c | 4 |
2 files changed, 7 insertions, 6 deletions
diff --git a/src/libtools/signal32.c b/src/libtools/signal32.c index 7d92f91f..1ce4f822 100644 --- a/src/libtools/signal32.c +++ b/src/libtools/signal32.c @@ -564,6 +564,7 @@ void my_sigactionhandler_oldcode_32(int32_t sig, int simple, siginfo_t* info, vo TRAP_x86_CACHEFLT = 19 // SIMD exception (via SIGFPE) if CPU is SSE capable otherwise Cache flush exception (via SIGSEV) */ uint32_t prot = getProtection((uintptr_t)info->si_addr); + uint32_t mmapped = getMmapped((uintptr_t)info->si_addr); uint32_t real_prot = 0; if(prot&PROT_READ) real_prot|=PROT_READ; if(prot&PROT_WRITE) real_prot|=PROT_WRITE; @@ -582,12 +583,12 @@ void my_sigactionhandler_oldcode_32(int32_t sig, int simple, siginfo_t* info, vo info2->si_errno = 0; } else if (info->si_errno==0xecec) { // no excute bit on segment - sigcontext->uc_mcontext.gregs[I386_ERR] = (real_prot&PROT_READ)?16:1; // EXECUTE_FAULT & READ_FAULT + sigcontext->uc_mcontext.gregs[I386_ERR] = 16;//(real_prot&PROT_READ)?16:1; // EXECUTE_FAULT & READ_FAULT sigcontext->uc_mcontext.gregs[I386_TRAPNO] = 14; info2->si_errno = 0; }else { - sigcontext->uc_mcontext.gregs[I386_ERR] = (real_prot&PROT_READ)?16:1;//(info->si_errno==0x1234)?0:((info->si_errno==0xdead)?(0x2|(info->si_code<<3)):0x0010); // execution flag issue (probably), unless it's a #GP(0) - sigcontext->uc_mcontext.gregs[I386_TRAPNO] = (getMmapped((uintptr_t)info->si_addr))?14:13; + sigcontext->uc_mcontext.gregs[I386_ERR] = mmapped?16:1;//(real_prot&PROT_READ)?16:1;//(info->si_errno==0x1234)?0:((info->si_errno==0xdead)?(0x2|(info->si_code<<3)):0x0010); // execution flag issue (probably), unless it's a #GP(0) + sigcontext->uc_mcontext.gregs[I386_TRAPNO] = (mmapped)?14:13; //sigcontext->uc_mcontext.gregs[I386_TRAPNO] = ((info->si_code==SEGV_ACCERR) || (info->si_errno==0x1234) || (info->si_errno==0xdead) || ((uintptr_t)info->si_addr==0))?13:14; } } else if(info->si_code==SEGV_ACCERR && !(prot&PROT_WRITE)) { @@ -642,7 +643,7 @@ void my_sigactionhandler_oldcode_32(int32_t sig, int simple, siginfo_t* info, vo sigcontext->uc_mcontext.gregs[I386_ERR] = 0; } //TODO: SIGABRT generate what? - printf_log((sig==10)?LOG_DEBUG:log_minimum, "Signal %d: si_addr=%p, TRAPNO=%d, ERR=%d, RIP=%p\n", sig, (void*)info2->si_addr, sigcontext->uc_mcontext.gregs[I386_TRAPNO], sigcontext->uc_mcontext.gregs[I386_ERR],from_ptrv(sigcontext->uc_mcontext.gregs[I386_EIP])); + printf_log((sig==10)?LOG_DEBUG:log_minimum, "Signal %d: si_addr=%p, TRAPNO=%d, ERR=%d, RIP=%p, prot:%x, mmaped:%d\n", sig, (void*)info2->si_addr, sigcontext->uc_mcontext.gregs[I386_TRAPNO], sigcontext->uc_mcontext.gregs[I386_ERR],from_ptrv(sigcontext->uc_mcontext.gregs[I386_EIP]), prot, mmapped); // call the signal handler i386_ucontext_t sigcontext_copy = *sigcontext; // save old value from emu diff --git a/src/libtools/signals.c b/src/libtools/signals.c index 2460a494..4dcabee3 100644 --- a/src/libtools/signals.c +++ b/src/libtools/signals.c @@ -1164,11 +1164,11 @@ void my_sigactionhandler_oldcode(x64emu_t* emu, int32_t sig, int simple, siginfo info2->si_errno = 0; } else if (info->si_errno==0xecec) { // no excute bit on segment - sigcontext->uc_mcontext.gregs[X64_ERR] = (real_prot&PROT_READ)?16:1; // EXECUTE_FAULT & READ_FAULT + sigcontext->uc_mcontext.gregs[X64_ERR] = 16;//(real_prot&PROT_READ)?16:1; // EXECUTE_FAULT & READ_FAULT sigcontext->uc_mcontext.gregs[X64_TRAPNO] = mmapped?14:13; info2->si_errno = 0; }else { - sigcontext->uc_mcontext.gregs[X64_ERR] = (real_prot&PROT_READ)?16:1;//(info->si_errno==0x1234)?0:((info->si_errno==0xdead)?(0x2|(info->si_code<<3)):0x0010); // execution flag issue (probably), unless it's a #GP(0) + sigcontext->uc_mcontext.gregs[X64_ERR] = mmapped?16:1;//(real_prot&PROT_READ)?16:1;//(info->si_errno==0x1234)?0:((info->si_errno==0xdead)?(0x2|(info->si_code<<3)):0x0010); // execution flag issue (probably), unless it's a #GP(0) sigcontext->uc_mcontext.gregs[X64_TRAPNO] = mmapped?14:13; //sigcontext->uc_mcontext.gregs[X64_TRAPNO] = ((info->si_code==SEGV_ACCERR) || (info->si_errno==0x1234) || (info->si_errno==0xdead) || ((uintptr_t)info->si_addr==0))?13:14; } |