Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 209181
b: refs/heads/master
c: 5528f91
h: refs/heads/master
i:
  209179: e0c182d
v: v3
  • Loading branch information
Linus Torvalds committed Aug 13, 2010
1 parent 03628f6 commit c42b061
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 2 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 320b2b8de12698082609ebbc1a17165727f4c893
refs/heads/master: 5528f9132cf65d4d892bcbc5684c61e7822b21e9
4 changes: 3 additions & 1 deletion trunk/mm/memory.c
Original file line number Diff line number Diff line change
Expand Up @@ -2792,8 +2792,10 @@ static int do_anonymous_page(struct mm_struct *mm, struct vm_area_struct *vma,
spinlock_t *ptl;
pte_t entry;

if (check_stack_guard_page(vma, address) < 0)
if (check_stack_guard_page(vma, address) < 0) {
pte_unmap(page_table);
return VM_FAULT_SIGBUS;
}

if (!(flags & FAULT_FLAG_WRITE)) {
entry = pte_mkspecial(pfn_pte(my_zero_pfn(address),
Expand Down

0 comments on commit c42b061

Please sign in to comment.