9 files changed, 12 insertions, 10 deletions

diff --git a/arch/arm/mm/fault.c b/arch/arm/mm/fault.c
index f0943d160ffe..a5b33ff3924e 100644
--- a/arch/arm/mm/fault.c
+++ b/arch/arm/mm/fault.c
@@ -171,7 +171,7 @@ good_area:
         if (fsr & (1 << 11)) /* write? */
                 mask = VM_WRITE;
         else
-                mask = VM_READ|VM_EXEC;
+                mask = VM_READ|VM_EXEC|VM_WRITE;
 
         fault = VM_FAULT_BADACCESS;
         if (!(vma->vm_flags & mask))
diff --git a/arch/arm26/mm/fault.c b/arch/arm26/mm/fault.c
index 761938b56679..a7c4cc922095 100644
--- a/arch/arm26/mm/fault.c
+++ b/arch/arm26/mm/fault.c
@@ -155,7 +155,7 @@ __do_page_fault(struct mm_struct *mm, unsigned long addr, unsigned int fsr,
          */
 good_area:
         if (READ_FAULT(fsr)) /* read? */
-                mask = VM_READ|VM_EXEC;
+                mask = VM_READ|VM_EXEC|VM_WRITE;
         else
                 mask = VM_WRITE;
 
diff --git a/arch/i386/mm/fault.c b/arch/i386/mm/fault.c
index 5e17a3f43b41..50d8617391dd 100644
--- a/arch/i386/mm/fault.c
+++ b/arch/i386/mm/fault.c
@@ -440,7 +440,7 @@ good_area:
                 case 1:         /* read, present */
                         goto bad_area;
                 case 0:         /* read, not present */
-                        if (!(vma->vm_flags & (VM_READ | VM_EXEC)))
+                        if (!(vma->vm_flags & (VM_READ | VM_EXEC | VM_WRITE)))
                                 goto bad_area;
         }
 
diff --git a/arch/ia64/mm/fault.c b/arch/ia64/mm/fault.c
index 14ef7cceb208..d8b1b4ac7f26 100644
--- a/arch/ia64/mm/fault.c
+++ b/arch/ia64/mm/fault.c
@@ -146,9 +146,11 @@ ia64_do_page_fault (unsigned long address, unsigned long isr, struct pt_regs *re
 #               error File is out of sync with <linux/mm.h>.  Please update.
 #       endif
 
+        if (((isr >> IA64_ISR_R_BIT) & 1UL) && (!(vma->vm_flags & (VM_READ | VM_WRITE))))
+                goto bad_area;
+
         mask = (  (((isr >> IA64_ISR_X_BIT) & 1UL) << VM_EXEC_BIT)
-                | (((isr >> IA64_ISR_W_BIT) & 1UL) << VM_WRITE_BIT)
-                | (((isr >> IA64_ISR_R_BIT) & 1UL) << VM_READ_BIT));
+                | (((isr >> IA64_ISR_W_BIT) & 1UL) << VM_WRITE_BIT));
 
         if ((vma->vm_flags & mask) != mask)
                 goto bad_area;
diff --git a/arch/m68k/mm/fault.c b/arch/m68k/mm/fault.c
index aec15270d334..5e2d87c10c87 100644
--- a/arch/m68k/mm/fault.c
+++ b/arch/m68k/mm/fault.c
@@ -144,7 +144,7 @@ good_area:
                 case 1:         /* read, present */
                         goto acc_err;
                 case 0:         /* read, not present */
-                        if (!(vma->vm_flags & (VM_READ | VM_EXEC)))
+                        if (!(vma->vm_flags & (VM_READ | VM_EXEC | VM_WRITE)))
                                 goto acc_err;
         }
 
diff --git a/arch/powerpc/mm/fault.c b/arch/powerpc/mm/fault.c
index 78a0d59903ee..77953f41d754 100644
--- a/arch/powerpc/mm/fault.c
+++ b/arch/powerpc/mm/fault.c
@@ -333,7 +333,7 @@ good_area:
                 /* protection fault */
                 if (error_code & 0x08000000)
                         goto bad_area;
-                if (!(vma->vm_flags & (VM_READ | VM_EXEC)))
+                if (!(vma->vm_flags & (VM_READ | VM_EXEC | VM_WRITE)))
                         goto bad_area;
         }
 
diff --git a/arch/ppc/mm/fault.c b/arch/ppc/mm/fault.c
index 5cdfb71fcb07..bc776beb3136 100644
--- a/arch/ppc/mm/fault.c
+++ b/arch/ppc/mm/fault.c
@@ -239,7 +239,7 @@ good_area:
                 /* protection fault */
                 if (error_code & 0x08000000)
                         goto bad_area;
-                if (!(vma->vm_flags & (VM_READ | VM_EXEC)))
+                if (!(vma->vm_flags & (VM_READ | VM_EXEC | VM_WRITE)))
                         goto bad_area;
         }
 
diff --git a/arch/sh/mm/fault.c b/arch/sh/mm/fault.c
index c69fd603226a..507f28914706 100644
--- a/arch/sh/mm/fault.c
+++ b/arch/sh/mm/fault.c
@@ -69,7 +69,7 @@ good_area:
                 if (!(vma->vm_flags & VM_WRITE))
                         goto bad_area;
         } else {
-                if (!(vma->vm_flags & (VM_READ | VM_EXEC)))
+                if (!(vma->vm_flags & (VM_READ | VM_EXEC | VM_WRITE)))
                         goto bad_area;
         }
 
diff --git a/arch/x86_64/mm/fault.c b/arch/x86_64/mm/fault.c
index 1a17b0733ab5..9ba54cc2b5f6 100644
--- a/arch/x86_64/mm/fault.c
+++ b/arch/x86_64/mm/fault.c
@@ -464,7 +464,7 @@ good_area:
                 case PF_PROT:           /* read, present */
                         goto bad_area;
                 case 0:                 /* read, not present */
-                        if (!(vma->vm_flags & (VM_READ | VM_EXEC)))
+                        if (!(vma->vm_flags & (VM_READ | VM_EXEC | VM_WRITE)))
                                 goto bad_area;
         }