Fix the PROT_EXEC breakage on anonymous mmap.

Clean up the tests while at it.

Fix the PROT_EXEC breakage on anonymous mmap.
Clean up the tests while at it.
8255b244 · Linus Torvalds · 58d11a39 · 8255b244
Commit 8255b244 authored Dec 05, 2003 by Linus Torvalds
Hide whitespace changes
Inline Side-by-side

Showing with 6 additions and 4 deletions

mm/mmap.c mm/mmap.c +6 -4

No files found.
--- a/mm/mmap.c
+++ b/mm/mmap.c
@@ -475,11 +475,13 @@ unsigned long do_mmap_pgoff(struct file * file, unsigned long addr,
 	struct rb_node ** rb_link, * rb_parent;
 	unsigned long charged = 0;
-	if (file && (!file->f_op || !file->f_op->mmap))
+	if (file) {
-		return -ENODEV;
+		if (!file->f_op || !file->f_op->mmap)
+			return -ENODEV;
-	if ((prot & PROT_EXEC) && (file->f_vfsmnt->mnt_flags & MNT_NOEXEC))
+		if ((prot & PROT_EXEC) && (file->f_vfsmnt->mnt_flags & MNT_NOEXEC))
-		return -EPERM;
+			return -EPERM;
+	}
 	if (!len)
 		return addr;