i2p/haiku-beta6
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

arch_setup_signal_frame(): panic() if we don't have a user iframe.

Browse Source 
git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@26808 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Ingo Weinhold
2008-08-04 21:49:11 +00:00
parent 5ccf1db34d
commit 2a24bab833
1 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/system/kernel/arch/x86/arch_thread.cpp
+7 -2
View File
@@ -170,7 +170,7 @@ x86_next_page_directory(struct thread *from, struct thread *to)
// the one we're switching to is kernel space // the one we're switching to is kernel space
return i386_translation_map_get_pgdir(&vm_kernel_address_space()->translation_map); return i386_translation_map_get_pgdir(&vm_kernel_address_space()->translation_map);
} }
return i386_translation_map_get_pgdir(&to->team->address_space->translation_map); return i386_translation_map_get_pgdir(&to->team->address_space->translation_map);
} }
@@ -439,6 +439,11 @@ arch_setup_signal_frame(struct thread *thread, struct sigaction *action,
int signal, int signalMask) int signal, int signalMask)
{ {
struct iframe *frame = get_current_iframe(); struct iframe *frame = get_current_iframe();
if (!IFRAME_IS_USER(frame)) {
panic("arch_setup_signal_frame(): No user iframe!");
return B_BAD_VALUE;
}
uint32 *signalCode; uint32 *signalCode;
uint32 *userRegs; uint32 *userRegs;
struct vregs regs; struct vregs regs;
@@ -473,7 +478,7 @@ arch_setup_signal_frame(struct thread *thread, struct sigaction *action,
regs._reserved_2[1] = frame->esi; regs._reserved_2[1] = frame->esi;
regs._reserved_2[2] = frame->ebp; regs._reserved_2[2] = frame->ebp;
i386_fnsave((void *)(&regs.xregs)); i386_fnsave((void *)(&regs.xregs));
userStack -= (sizeof(struct vregs) + 3) / 4; userStack -= (sizeof(struct vregs) + 3) / 4;
userRegs = userStack; userRegs = userStack;
status = user_memcpy(userRegs, &regs, sizeof(regs)); status = user_memcpy(userRegs, &regs, sizeof(regs));