From e547cf6da3ad813021535e57d6227e1d14698dc3 Mon Sep 17 00:00:00 2001
From: Paolo 'Blaisorblade' Giarrusso <blaisorblade@yahoo.it>
Date: Sat, 10 Sep 2005 19:44:57 +0200
Subject: [PATCH] --- yaml --- r: 8441 b: refs/heads/master c:
 d129f31236c241c07e583e8bc695c382365d02ce h: refs/heads/master i:   8439:
 6cc3297c87473bbe429fa11b3e8a4f2ec563bdc3 v: v3

---
 [refs]                           | 2 +-
 trunk/arch/um/kernel/trap_kern.c | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index e2f278ee9023..a4c44ae08ebf 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: d99c4022f60a9aa3a8dc6b7d71f3d0998c696912
+refs/heads/master: d129f31236c241c07e583e8bc695c382365d02ce
diff --git a/trunk/arch/um/kernel/trap_kern.c b/trunk/arch/um/kernel/trap_kern.c
index b5fc89fe9eab..d20361dcd127 100644
--- a/trunk/arch/um/kernel/trap_kern.c
+++ b/trunk/arch/um/kernel/trap_kern.c
@@ -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 {