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

The userland stack trace no longer accesses the stack of the crashed application unsafe.

Browse Source 
git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@16071 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Axel Dörfler
2006-01-24 17:22:50 +00:00
parent 890d7226ed
commit d97476d155
1 changed files with 12 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/system/kernel/vm/vm.cpp
+12 -7
View File
@@ -2377,8 +2377,7 @@ vm_page_fault(addr_t address, addr_t fault_address, bool is_write, bool is_user,
thread_get_current_thread()->team->id, fault_address, thread_get_current_thread()->team->id, fault_address,
area ? area->name : "???", fault_address - (area ? area->base : 0x0)); area ? area->name : "???", fault_address - (area ? area->base : 0x0));
// We can print a stack trace of the userland thread here. Since we're accessing // We can print a stack trace of the userland thread here.
// user memory freely and unchecked, this is not enabled by default.
#if 0 #if 0
if (area) { if (area) {
struct stack_frame { struct stack_frame {
@@ -2392,18 +2391,24 @@ vm_page_fault(addr_t address, addr_t fault_address, bool is_write, bool is_user,
struct iframe *iframe = i386_get_user_iframe(); struct iframe *iframe = i386_get_user_iframe();
if (iframe == NULL) if (iframe == NULL)
panic("iframe is NULL!"); panic("iframe is NULL!");
struct stack_frame *frame = (struct stack_frame *)iframe->ebp;
struct stack_frame frame;
status_t status = user_memcpy(&frame, (void *)iframe->ebp,
sizeof(struct stack_frame));
dprintf("stack trace:\n"); dprintf("stack trace:\n");
for (; frame; frame = frame->previous) { while (status == B_OK) {
dprintf(" 0x%p", frame->return_address); dprintf(" 0x%p", frame.return_address);
area = vm_area_lookup(addressSpace, area = vm_area_lookup(addressSpace,
(addr_t)frame->return_address); (addr_t)frame.return_address);
if (area) { if (area) {
dprintf(" (%s + %#lx)", area->name, dprintf(" (%s + %#lx)", area->name,
(addr_t)frame->return_address - area->base); (addr_t)frame.return_address - area->base);
} }
dprintf("\n"); dprintf("\n");
status = user_memcpy(&frame, frame.previous,
sizeof(struct stack_frame));
} }
} }
#endif // 0 (stack trace) #endif // 0 (stack trace)