mirror of
https://github.com/jart/cosmopolitan.git
synced 2025-06-26 22:38:30 +00:00
Improve signals and memory protection
- Document sigaction() - Simplify New Technology fork() code - Testing and many bug fixes for mprotect() - Distribute Intel Xed ILD in the amalgamation - Turn Xed enums into defines to avoid DWARF bloat - Improve polyfilling of SA_SIGINFO on BSDs and fix bugs - setpgid(getpid(), getpid()) on Windows will ignore CTRL-C - Work around issues relating to NT mappings being executable - Permit automatic executable stack override via `ape_stack_pf`
This commit is contained in:
Justine Tunney
parent
c95c9d9508
commit
f684e348d4
76 changed files with 1844 additions and 1121 deletions
|
|
@ -19,83 +19,101 @@
|
|||
#include "libc/calls/calls.h"
|
||||
#include "libc/calls/internal.h"
|
||||
#include "libc/calls/struct/sigaction-freebsd.internal.h"
|
||||
#include "libc/calls/struct/siginfo-freebsd.internal.h"
|
||||
#include "libc/calls/struct/siginfo.h"
|
||||
#include "libc/calls/struct/ucontext-freebsd.internal.h"
|
||||
#include "libc/calls/typedef/sigaction_f.h"
|
||||
#include "libc/calls/ucontext.h"
|
||||
#include "libc/intrin/kprintf.h"
|
||||
#include "libc/intrin/repstosb.h"
|
||||
#include "libc/macros.internal.h"
|
||||
#include "libc/str/str.h"
|
||||
#include "libc/sysv/consts/sa.h"
|
||||
|
||||
void __sigenter_freebsd(int sig, struct siginfo_freebsd *si,
|
||||
void __sigenter_freebsd(int sig, struct siginfo_freebsd *freebsdinfo,
|
||||
struct ucontext_freebsd *ctx) {
|
||||
int rva;
|
||||
ucontext_t uc;
|
||||
int rva, flags;
|
||||
struct Goodies {
|
||||
ucontext_t uc;
|
||||
siginfo_t si;
|
||||
} g;
|
||||
rva = __sighandrvas[sig & (NSIG - 1)];
|
||||
if (rva >= kSigactionMinRva) {
|
||||
bzero(&uc, sizeof(uc));
|
||||
if (ctx) {
|
||||
uc.uc_mcontext.fpregs = &uc.__fpustate;
|
||||
uc.uc_stack.ss_sp = ctx->uc_stack.ss_sp;
|
||||
uc.uc_stack.ss_size = ctx->uc_stack.ss_size;
|
||||
uc.uc_stack.ss_flags = ctx->uc_stack.ss_flags;
|
||||
uc.uc_flags = ctx->uc_flags;
|
||||
memcpy(&uc.uc_sigmask, &ctx->uc_sigmask,
|
||||
MIN(sizeof(uc.uc_sigmask), sizeof(ctx->uc_sigmask)));
|
||||
uc.uc_mcontext.r8 = ctx->uc_mcontext.mc_r8;
|
||||
uc.uc_mcontext.r9 = ctx->uc_mcontext.mc_r9;
|
||||
uc.uc_mcontext.r10 = ctx->uc_mcontext.mc_r10;
|
||||
uc.uc_mcontext.r11 = ctx->uc_mcontext.mc_r11;
|
||||
uc.uc_mcontext.r12 = ctx->uc_mcontext.mc_r12;
|
||||
uc.uc_mcontext.r13 = ctx->uc_mcontext.mc_r13;
|
||||
uc.uc_mcontext.r14 = ctx->uc_mcontext.mc_r14;
|
||||
uc.uc_mcontext.r15 = ctx->uc_mcontext.mc_r15;
|
||||
uc.uc_mcontext.rdi = ctx->uc_mcontext.mc_rdi;
|
||||
uc.uc_mcontext.rsi = ctx->uc_mcontext.mc_rsi;
|
||||
uc.uc_mcontext.rbp = ctx->uc_mcontext.mc_rbp;
|
||||
uc.uc_mcontext.rbx = ctx->uc_mcontext.mc_rbx;
|
||||
uc.uc_mcontext.rdx = ctx->uc_mcontext.mc_rdx;
|
||||
uc.uc_mcontext.rax = ctx->uc_mcontext.mc_rax;
|
||||
uc.uc_mcontext.rcx = ctx->uc_mcontext.mc_rcx;
|
||||
uc.uc_mcontext.rsp = ctx->uc_mcontext.mc_rsp;
|
||||
uc.uc_mcontext.rip = ctx->uc_mcontext.mc_rip;
|
||||
uc.uc_mcontext.eflags = ctx->uc_mcontext.mc_flags;
|
||||
uc.uc_mcontext.fs = ctx->uc_mcontext.mc_fs;
|
||||
uc.uc_mcontext.gs = ctx->uc_mcontext.mc_gs;
|
||||
uc.uc_mcontext.err = ctx->uc_mcontext.mc_err;
|
||||
uc.uc_mcontext.trapno = ctx->uc_mcontext.mc_trapno;
|
||||
memcpy(&uc.__fpustate, &ctx->uc_mcontext.mc_fpstate, 512);
|
||||
}
|
||||
((sigaction_f)(_base + rva))(sig, (void *)si, &uc);
|
||||
if (ctx) {
|
||||
ctx->uc_stack.ss_sp = uc.uc_stack.ss_sp;
|
||||
ctx->uc_stack.ss_size = uc.uc_stack.ss_size;
|
||||
ctx->uc_stack.ss_flags = uc.uc_stack.ss_flags;
|
||||
ctx->uc_flags = uc.uc_flags;
|
||||
memcpy(&ctx->uc_sigmask, &uc.uc_sigmask,
|
||||
MIN(sizeof(uc.uc_sigmask), sizeof(ctx->uc_sigmask)));
|
||||
ctx->uc_mcontext.mc_rdi = uc.uc_mcontext.rdi;
|
||||
ctx->uc_mcontext.mc_rsi = uc.uc_mcontext.rsi;
|
||||
ctx->uc_mcontext.mc_rdx = uc.uc_mcontext.rdx;
|
||||
ctx->uc_mcontext.mc_rcx = uc.uc_mcontext.rcx;
|
||||
ctx->uc_mcontext.mc_r8 = uc.uc_mcontext.r8;
|
||||
ctx->uc_mcontext.mc_r9 = uc.uc_mcontext.r9;
|
||||
ctx->uc_mcontext.mc_rax = uc.uc_mcontext.rax;
|
||||
ctx->uc_mcontext.mc_rbx = uc.uc_mcontext.rbx;
|
||||
ctx->uc_mcontext.mc_rbp = uc.uc_mcontext.rbp;
|
||||
ctx->uc_mcontext.mc_r10 = uc.uc_mcontext.r10;
|
||||
ctx->uc_mcontext.mc_r11 = uc.uc_mcontext.r11;
|
||||
ctx->uc_mcontext.mc_r12 = uc.uc_mcontext.r12;
|
||||
ctx->uc_mcontext.mc_r13 = uc.uc_mcontext.r13;
|
||||
ctx->uc_mcontext.mc_r14 = uc.uc_mcontext.r14;
|
||||
ctx->uc_mcontext.mc_r15 = uc.uc_mcontext.r15;
|
||||
ctx->uc_mcontext.mc_trapno = uc.uc_mcontext.trapno;
|
||||
ctx->uc_mcontext.mc_fs = uc.uc_mcontext.fs;
|
||||
ctx->uc_mcontext.mc_gs = uc.uc_mcontext.gs;
|
||||
ctx->uc_mcontext.mc_flags = uc.uc_mcontext.eflags;
|
||||
ctx->uc_mcontext.mc_err = uc.uc_mcontext.err;
|
||||
ctx->uc_mcontext.mc_rip = uc.uc_mcontext.rip;
|
||||
ctx->uc_mcontext.mc_rsp = uc.uc_mcontext.rsp;
|
||||
memcpy(&ctx->uc_mcontext.mc_fpstate, &uc.__fpustate, 512);
|
||||
flags = __sighandflags[sig & (NSIG - 1)];
|
||||
if (~flags & SA_SIGINFO) {
|
||||
((sigaction_f)(_base + rva))(sig, 0, 0);
|
||||
} else {
|
||||
repstosb(&g, 0, sizeof(g));
|
||||
g.uc.uc_mcontext.fpregs = &g.uc.__fpustate;
|
||||
g.uc.uc_stack.ss_sp = ctx->uc_stack.ss_sp;
|
||||
g.uc.uc_stack.ss_size = ctx->uc_stack.ss_size;
|
||||
g.uc.uc_stack.ss_flags = ctx->uc_stack.ss_flags;
|
||||
g.uc.uc_flags = ctx->uc_flags;
|
||||
memcpy(&g.uc.uc_sigmask, &ctx->uc_sigmask,
|
||||
MIN(sizeof(g.uc.uc_sigmask), sizeof(ctx->uc_sigmask)));
|
||||
g.uc.uc_mcontext.r8 = ctx->uc_mcontext.mc_r8;
|
||||
g.uc.uc_mcontext.r9 = ctx->uc_mcontext.mc_r9;
|
||||
g.uc.uc_mcontext.r10 = ctx->uc_mcontext.mc_r10;
|
||||
g.uc.uc_mcontext.r11 = ctx->uc_mcontext.mc_r11;
|
||||
g.uc.uc_mcontext.r12 = ctx->uc_mcontext.mc_r12;
|
||||
g.uc.uc_mcontext.r13 = ctx->uc_mcontext.mc_r13;
|
||||
g.uc.uc_mcontext.r14 = ctx->uc_mcontext.mc_r14;
|
||||
g.uc.uc_mcontext.r15 = ctx->uc_mcontext.mc_r15;
|
||||
g.uc.uc_mcontext.rdi = ctx->uc_mcontext.mc_rdi;
|
||||
g.uc.uc_mcontext.rsi = ctx->uc_mcontext.mc_rsi;
|
||||
g.uc.uc_mcontext.rbp = ctx->uc_mcontext.mc_rbp;
|
||||
g.uc.uc_mcontext.rbx = ctx->uc_mcontext.mc_rbx;
|
||||
g.uc.uc_mcontext.rdx = ctx->uc_mcontext.mc_rdx;
|
||||
g.uc.uc_mcontext.rax = ctx->uc_mcontext.mc_rax;
|
||||
g.uc.uc_mcontext.rcx = ctx->uc_mcontext.mc_rcx;
|
||||
g.uc.uc_mcontext.rsp = ctx->uc_mcontext.mc_rsp;
|
||||
g.uc.uc_mcontext.rip = ctx->uc_mcontext.mc_rip;
|
||||
g.uc.uc_mcontext.eflags = ctx->uc_mcontext.mc_flags;
|
||||
g.uc.uc_mcontext.fs = ctx->uc_mcontext.mc_fs;
|
||||
g.uc.uc_mcontext.gs = ctx->uc_mcontext.mc_gs;
|
||||
g.uc.uc_mcontext.err = ctx->uc_mcontext.mc_err;
|
||||
g.uc.uc_mcontext.trapno = ctx->uc_mcontext.mc_trapno;
|
||||
memcpy(&g.uc.__fpustate, &ctx->uc_mcontext.mc_fpstate, 512);
|
||||
g.si.si_signo = freebsdinfo->si_signo;
|
||||
g.si.si_errno = freebsdinfo->si_errno;
|
||||
g.si.si_code = freebsdinfo->si_code;
|
||||
if (freebsdinfo->si_pid) {
|
||||
g.si.si_pid = freebsdinfo->si_pid;
|
||||
g.si.si_uid = freebsdinfo->si_uid;
|
||||
} else {
|
||||
g.si.si_addr = (void *)freebsdinfo->si_addr;
|
||||
}
|
||||
g.si.si_value = freebsdinfo->si_value;
|
||||
((sigaction_f)(_base + rva))(sig, &g.si, &g.uc);
|
||||
ctx->uc_stack.ss_sp = g.uc.uc_stack.ss_sp;
|
||||
ctx->uc_stack.ss_size = g.uc.uc_stack.ss_size;
|
||||
ctx->uc_stack.ss_flags = g.uc.uc_stack.ss_flags;
|
||||
ctx->uc_flags = g.uc.uc_flags;
|
||||
memcpy(&ctx->uc_sigmask, &g.uc.uc_sigmask,
|
||||
MIN(sizeof(g.uc.uc_sigmask), sizeof(ctx->uc_sigmask)));
|
||||
ctx->uc_mcontext.mc_rdi = g.uc.uc_mcontext.rdi;
|
||||
ctx->uc_mcontext.mc_rsi = g.uc.uc_mcontext.rsi;
|
||||
ctx->uc_mcontext.mc_rdx = g.uc.uc_mcontext.rdx;
|
||||
ctx->uc_mcontext.mc_rcx = g.uc.uc_mcontext.rcx;
|
||||
ctx->uc_mcontext.mc_r8 = g.uc.uc_mcontext.r8;
|
||||
ctx->uc_mcontext.mc_r9 = g.uc.uc_mcontext.r9;
|
||||
ctx->uc_mcontext.mc_rax = g.uc.uc_mcontext.rax;
|
||||
ctx->uc_mcontext.mc_rbx = g.uc.uc_mcontext.rbx;
|
||||
ctx->uc_mcontext.mc_rbp = g.uc.uc_mcontext.rbp;
|
||||
ctx->uc_mcontext.mc_r10 = g.uc.uc_mcontext.r10;
|
||||
ctx->uc_mcontext.mc_r11 = g.uc.uc_mcontext.r11;
|
||||
ctx->uc_mcontext.mc_r12 = g.uc.uc_mcontext.r12;
|
||||
ctx->uc_mcontext.mc_r13 = g.uc.uc_mcontext.r13;
|
||||
ctx->uc_mcontext.mc_r14 = g.uc.uc_mcontext.r14;
|
||||
ctx->uc_mcontext.mc_r15 = g.uc.uc_mcontext.r15;
|
||||
ctx->uc_mcontext.mc_trapno = g.uc.uc_mcontext.trapno;
|
||||
ctx->uc_mcontext.mc_fs = g.uc.uc_mcontext.fs;
|
||||
ctx->uc_mcontext.mc_gs = g.uc.uc_mcontext.gs;
|
||||
ctx->uc_mcontext.mc_flags = g.uc.uc_mcontext.eflags;
|
||||
ctx->uc_mcontext.mc_err = g.uc.uc_mcontext.err;
|
||||
ctx->uc_mcontext.mc_rip = g.uc.uc_mcontext.rip;
|
||||
ctx->uc_mcontext.mc_rsp = g.uc.uc_mcontext.rsp;
|
||||
memcpy(&ctx->uc_mcontext.mc_fpstate, &g.uc.__fpustate, 512);
|
||||
}
|
||||
}
|
||||
/*
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue