Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 8441
b: refs/heads/master
c: d129f31
h: refs/heads/master
i:
  8439: 6cc3297
v: v3
  • Loading branch information
Paolo 'Blaisorblade' Giarrusso authored and Linus Torvalds committed Sep 10, 2005
1 parent a8225fe commit e547cf6
Show file tree
Hide file tree
Showing 2 changed files with 3 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: d99c4022f60a9aa3a8dc6b7d71f3d0998c696912
refs/heads/master: d129f31236c241c07e583e8bc695c382365d02ce
3 changes: 2 additions & 1 deletion trunk/arch/um/kernel/trap_kern.c
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,8 @@ int handle_page_fault(unsigned long address, unsigned long ip,
if(is_write && !(vma->vm_flags & VM_WRITE))
goto out;

if(!(vma->vm_flags & (VM_READ | VM_EXEC)))
/* Don't require VM_READ|VM_EXEC for write faults! */
if(!is_write && !(vma->vm_flags & (VM_READ | VM_EXEC)))
goto out;

do {
Expand Down

0 comments on commit e547cf6

Please sign in to comment.