mirrors/Astral
1
0
Fork 0
mirror of https://github.com/Mathewnd/Astral.git synced 2026-11-01 15:08:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

signal: fix sigaltstack

Browse Source
This commit is contained in:
Matheus
2024-09-09 23:43:51 -03:00
parent c12f724d64
commit 57b6d7c1a1
1 changed files with 10 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
kernel-src/sys/signal.c
+10 -4
View File
@@ -77,11 +77,15 @@ void signal_action(struct proc_t *proc, int signal, sigaction_t *new, sigaction_
void signal_altstack(struct thread_t *thread, stack_t *new, stack_t *old) { void signal_altstack(struct thread_t *thread, stack_t *new, stack_t *old) {
THREAD_ENTER(thread); THREAD_ENTER(thread);
if (old) if (old) {
*old = thread->signals.stack; *old = thread->signals.stack;
printf("signal altstack: old base %p size %lu flg %x\n", old->base, old->size, old->flags);
}
if (new) if (new) {
thread->signals.stack = *new; thread->signals.stack = *new;
printf("signal altstack: new base %p size %lu flg %x\n", new->base, new->size, new->flags);
}
THREAD_LEAVE(thread); THREAD_LEAVE(thread);
} }
@@ -524,8 +528,8 @@ bool signal_check(struct thread_t *thread, context_t *context, bool syscall, uin
altstack = thread->signals.stack.base; altstack = thread->signals.stack.base;
// get where in memory to put the frame // get where in memory to put the frame
void *stack = altstack ? altstack : (void *)CTX_SP(context);
#if ARCH_SIGNAL_STACK_GROWS_DOWNWARDS == 1 #if ARCH_SIGNAL_STACK_GROWS_DOWNWARDS == 1
void *stack = altstack ? (void *)((uintptr_t)altstack + thread->signals.stack.size) : (void *)CTX_SP(context);
stack = (void *)((((uintptr_t)stack - ARCH_SIGNAL_REDZONE_SIZE - sizeof(sigframe_t)) & ~0xfl) - 0x8); stack = (void *)((((uintptr_t)stack - ARCH_SIGNAL_REDZONE_SIZE - sizeof(sigframe_t)) & ~0xfl) - 0x8);
#else #else
#error unsupported #error unsupported
@@ -544,6 +548,8 @@ bool signal_check(struct thread_t *thread, context_t *context, bool syscall, uin
if (altstack) { if (altstack) {
memcpy(&sigframe.oldstack, &thread->signals.stack, sizeof(stack_t)); memcpy(&sigframe.oldstack, &thread->signals.stack, sizeof(stack_t));
memset(&thread->signals.stack, 0, sizeof(stack_t)); memset(&thread->signals.stack, 0, sizeof(stack_t));
} else {
memset(&sigframe.oldstack, 0, sizeof(stack_t));
} }
if (thread->signals.suspending) { if (thread->signals.suspending) {
@@ -560,7 +566,7 @@ bool signal_check(struct thread_t *thread, context_t *context, bool syscall, uin
// TODO siginfo // TODO siginfo
if (usercopy_touser(stack, &sigframe, sizeof(sigframe_t))) { if (usercopy_touser(stack, &sigframe, sizeof(sigframe_t))) {
printf("signal: bad user stack\n"); printf("signal: bad user stack %p\n", stack);
THREAD_LEAVE(thread); THREAD_LEAVE(thread);
PROCESS_LEAVE(proc); PROCESS_LEAVE(proc);
interrupt_set(true); interrupt_set(true);