aboutsummaryrefslogtreecommitdiff
path: root/mm
diff options
context:
space:
mode:
authorJeff Garzik <jeff@garzik.org>2006-04-18 04:54:00 -0400
committerJeff Garzik <jeff@garzik.org>2006-04-18 04:54:00 -0400
commit4741c336d27dec3ea68a35659abb8dc82b142388 (patch)
treea8576df82129354b77b0144c480c446ec7aba7b2 /mm
parent26ec634c31a11a003040e10b4d650495158632fd (diff)
parenta9a5cd5d2a57fb76dbae2115450f777b69beccf7 (diff)
Merge branch 'master'
Diffstat (limited to 'mm')
-rw-r--r--mm/madvise.c3
1 files changed, 3 insertions, 0 deletions
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)