From: Hugh Dickins <hugh@veritas.com>
Date: Mon, 17 Apr 2006 21:46:32 +0000 (+0100)
Subject: [PATCH] Fix MADV_REMOVE protection checking
X-Git-Tag: v2.6.17-rc2~18
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=69cf0fac6052c5bd3fb3469a41d4216e926028f8;p=linux-2.6-omap-h63xx.git

[PATCH] Fix MADV_REMOVE protection checking

madvise_remove needs to respect file and mmap protections.

Signed-off-by: Hugh Dickins <hugh@veritas.com>
[ Will the real CVE-2006-1524 stand up, please.. ]
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
---

diff --git a/mm/madvise.c b/mm/madvise.c
index af3d573b014..4e196155a0c 100644
--- a/mm/madvise.c
+++ b/mm/madvise.c
@@ -168,6 +168,9 @@ static long madvise_remove(struct vm_area_struct *vma,
 			return -EINVAL;
 	}
 
+	if ((vma->vm_flags & (VM_SHARED|VM_WRITE)) != (VM_SHARED|VM_WRITE))
+		return -EACCES;
+
 	mapping = vma->vm_file->f_mapping;
 
 	offset = (loff_t)(start - vma->vm_start)