Imperial-MEng/pintos_22
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: remove stack fault checks for page faults outside user non-present addresses

Browse Source
This commit is contained in:
Themis Demetriades
2024-12-02 21:07:17 +00:00
parent fbcd3c9f19
commit df7d847978
2 changed files with 2 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/userprog/exception.c
View File

@@ -149,14 +149,10 @@ page_fault (struct intr_frame *f)
#ifdef VM #ifdef VM
if (user && not_present) if (user && not_present)
{ {
if (handle_stack_fault (fault_addr, f->esp)) if (handle_stack_fault (fault_addr, f->esp)) return;
return;
} }
else else
{ {
if (handle_stack_fault (fault_addr, thread_current ()->curr_esp))
return;
f->eip = (void *)f->eax; f->eip = (void *)f->eax;
f->eax = 0xffffffff; f->eax = 0xffffffff;
return; return;

3
src/vm/stackgrowth.c
View File

@@ -26,8 +26,7 @@ handle_stack_fault (const void *ptr, const void *esp)
static bool static bool
is_stack_fault (const void *addr, const void *esp) is_stack_fault (const void *addr, const void *esp)
{ {
return (is_user_vaddr (addr) && return ((uint32_t*)addr >= ((uint32_t*)esp - MAX_STACK_ACCESS_DIST) &&
(uint32_t*)addr >= ((uint32_t*)esp - MAX_STACK_ACCESS_DIST) &&
((PHYS_BASE - pg_round_down (addr)) <= MAX_STACK_SIZE)); ((PHYS_BASE - pg_round_down (addr)) <= MAX_STACK_SIZE));
} }