x86_64: Use 0x516 as magic signal return address

klange · Jan 21, 2024 · 231f708 · 231f708
1 parent d392600
commit 231f708
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/kernel/arch/x86_64/idt.c b/kernel/arch/x86_64/idt.c
@@ -499,8 +499,8 @@ static void _page_fault(struct regs * r) {
 	uintptr_t faulting_address;
 	asm volatile("mov %%cr2, %0" : "=r"(faulting_address));
 
-	/* 8DEADBEEFh is the magic ret-from-sig address. */
-	if (faulting_address == 0x8DEADBEEF) {
+	/* magic ret-from-sig address */
+	if (faulting_address == 0x516) {
 		return_from_signal_handler(r);
 		return;
 	}

diff --git a/kernel/arch/x86_64/user.c b/kernel/arch/x86_64/user.c
@@ -138,7 +138,7 @@ void arch_enter_signal_handler(uintptr_t entrypoint, int signum, struct regs *r)
 		PUSH(ret.rsp, uint64_t, this_core->current_process->thread.fp_regs[i]);
 	}
 
-	PUSH(ret.rsp, uintptr_t, 0x00000008DEADBEEF);
+	PUSH(ret.rsp, uintptr_t, 0x516);
 
 	update_process_times_on_exit();