|
@@ -1302,6 +1302,8 @@ unsigned long do_mmap_pgoff(struct file *file, unsigned long addr,
|
|
|
|
|
|
if (!file->f_op || !file->f_op->mmap)
|
|
|
return -ENODEV;
|
|
|
+ if (vm_flags & (VM_GROWSDOWN|VM_GROWSUP))
|
|
|
+ return -EINVAL;
|
|
|
break;
|
|
|
|
|
|
default:
|
|
@@ -1310,6 +1312,8 @@ unsigned long do_mmap_pgoff(struct file *file, unsigned long addr,
|
|
|
} else {
|
|
|
switch (flags & MAP_TYPE) {
|
|
|
case MAP_SHARED:
|
|
|
+ if (vm_flags & (VM_GROWSDOWN|VM_GROWSUP))
|
|
|
+ return -EINVAL;
|
|
|
/*
|
|
|
* Ignore pgoff.
|
|
|
*/
|
|
@@ -1544,11 +1548,7 @@ munmap_back:
|
|
|
vma->vm_pgoff = pgoff;
|
|
|
INIT_LIST_HEAD(&vma->anon_vma_chain);
|
|
|
|
|
|
- error = -EINVAL; /* when rejecting VM_GROWSDOWN|VM_GROWSUP */
|
|
|
-
|
|
|
if (file) {
|
|
|
- if (vm_flags & (VM_GROWSDOWN|VM_GROWSUP))
|
|
|
- goto free_vma;
|
|
|
if (vm_flags & VM_DENYWRITE) {
|
|
|
error = deny_write_access(file);
|
|
|
if (error)
|
|
@@ -1573,8 +1573,6 @@ munmap_back:
|
|
|
pgoff = vma->vm_pgoff;
|
|
|
vm_flags = vma->vm_flags;
|
|
|
} else if (vm_flags & VM_SHARED) {
|
|
|
- if (unlikely(vm_flags & (VM_GROWSDOWN|VM_GROWSUP)))
|
|
|
- goto free_vma;
|
|
|
error = shmem_zero_setup(vma);
|
|
|
if (error)
|
|
|
goto free_vma;
|