X-Git-Url: http://pilppa.org/gitweb/?a=blobdiff_plain;f=mm%2Fmadvise.c;h=77916e9fc52bc466abb08d55457b8c79b0e05854;hb=d01320e606d334a0cd35d781a58f9f3c254829ab;hp=af3d573b014122f7fd2a99c3ee90c3826f70457f;hpb=5b2ffed906a3ebd4e52a5bbef06b99a517c53e4b;p=linux-2.6-omap-h63xx.git

diff --git a/mm/madvise.c b/mm/madvise.c
index af3d573b014..77916e9fc52 100644
--- a/mm/madvise.c
+++ b/mm/madvise.c
@@ -155,11 +155,14 @@ static long madvise_dontneed(struct vm_area_struct * vma,
  * Other filesystems return -ENOSYS.
  */
 static long madvise_remove(struct vm_area_struct *vma,
+				struct vm_area_struct **prev,
 				unsigned long start, unsigned long end)
 {
 	struct address_space *mapping;
         loff_t offset, endoff;
 
+	*prev = vma;
+
 	if (vma->vm_flags & (VM_LOCKED|VM_NONLINEAR|VM_HUGETLB))
 		return -EINVAL;
 
@@ -168,6 +171,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)
@@ -196,7 +202,7 @@ madvise_vma(struct vm_area_struct *vma, struct vm_area_struct **prev,
 		error = madvise_behavior(vma, prev, start, end, behavior);
 		break;
 	case MADV_REMOVE:
-		error = madvise_remove(vma, start, end);
+		error = madvise_remove(vma, prev, start, end);
 		break;
 
 	case MADV_WILLNEED: