From 5fa161362e5f71f069af8075d3aebad443c62228 Mon Sep 17 00:00:00 2001
From: Jeff Dike <jdike@addtoit.com>
Date: Fri, 20 May 2005 13:59:08 -0700
Subject: [PATCH] --- yaml --- r: 1285 b: refs/heads/master c:
 13479d52c7a61a18900d7f36730b7d3b43723d97 h: refs/heads/master i:   1283:
 8f3ba3649fa972618a523d229e2f8e044932cb6f v: v3

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

diff --git a/[refs] b/[refs]
index 6f6c7ef13e7c..7b1161793ab9 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: ba9950c820e556e39cd26581826b5581a64fb641
+refs/heads/master: 13479d52c7a61a18900d7f36730b7d3b43723d97
diff --git a/trunk/arch/um/kernel/trap_kern.c b/trunk/arch/um/kernel/trap_kern.c
index 5fca2c61eb98..9ae2eff0d8f3 100644
--- a/trunk/arch/um/kernel/trap_kern.c
+++ b/trunk/arch/um/kernel/trap_kern.c
@@ -57,10 +57,11 @@ int handle_page_fault(unsigned long address, unsigned long ip,
 	*code_out = SEGV_ACCERR;
 	if(is_write && !(vma->vm_flags & VM_WRITE)) 
 		goto out;
+
+        if(!(vma->vm_flags & (VM_READ | VM_EXEC)))
+                goto out;
+
 	page = address & PAGE_MASK;
-	pgd = pgd_offset(mm, page);
-	pud = pud_offset(pgd, page);
-	pmd = pmd_offset(pud, page);
 	do {
  survive:
 		switch (handle_mm_fault(mm, vma, address, is_write)){