leandrof/linux
1
0
Fork 0
forked from Minki/linux
Code Issues Pull Requests Packages Projects Releases Wiki Activity

move security_mmap_addr() to saner place

Browse Source 
it really should be done by get_unmapped_area(); that cuts down on
the amount of callers considerably and it's the right place for
that stuff anyway.

Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
This commit is contained in:
Al Viro 2012-05-30 17:13:15 -04:00
parent 8b3ec6814c
commit 9ac4ed4bd0
2 changed files with 3 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
mm/mmap.c
View File

@ -978,7 +978,6 @@ static unsigned long do_mmap_pgoff(struct file *file, unsigned long addr,
struct mm_struct * mm = current->mm; struct mm_struct * mm = current->mm;
struct inode *inode; struct inode *inode;
vm_flags_t vm_flags; vm_flags_t vm_flags;
int error;
/* /*
* Does the application expect PROT_READ to imply PROT_EXEC? * Does the application expect PROT_READ to imply PROT_EXEC?
@ -1100,10 +1099,6 @@ static unsigned long do_mmap_pgoff(struct file *file, unsigned long addr,
} }
} }
error = security_mmap_addr(addr);
if (error)
return error;
return mmap_region(file, addr, len, flags, vm_flags, pgoff); return mmap_region(file, addr, len, flags, vm_flags, pgoff);
} }
@ -1633,7 +1628,9 @@ get_unmapped_area(struct file *file, unsigned long addr, unsigned long len,
if (addr & ~PAGE_MASK) if (addr & ~PAGE_MASK)
return -EINVAL; return -EINVAL;
return arch_rebalance_pgtables(addr, len); addr = arch_rebalance_pgtables(addr, len);
error = security_mmap_addr(addr);
return error ? error : addr;
} }
EXPORT_SYMBOL(get_unmapped_area); EXPORT_SYMBOL(get_unmapped_area);
@ -2210,10 +2207,6 @@ static unsigned long do_brk(unsigned long addr, unsigned long len)
if (!len) if (!len)
return addr; return addr;
error = security_mmap_addr(addr);
if (error)
return error;
flags = VM_DATA_DEFAULT_FLAGS | VM_ACCOUNT | mm->def_flags; flags = VM_DATA_DEFAULT_FLAGS | VM_ACCOUNT | mm->def_flags;
error = get_unmapped_area(NULL, addr, len, 0, MAP_FIXED); error = get_unmapped_area(NULL, addr, len, 0, MAP_FIXED);
@ -2566,10 +2559,6 @@ int install_special_mapping(struct mm_struct *mm,
vma->vm_ops = &special_mapping_vmops; vma->vm_ops = &special_mapping_vmops;
vma->vm_private_data = pages; vma->vm_private_data = pages;
ret = security_mmap_addr(vma->vm_start);
if (ret)
goto out;
ret = insert_vm_struct(mm, vma); ret = insert_vm_struct(mm, vma);
if (ret) if (ret)
goto out; goto out;

7
mm/mremap.c
View File

@ -371,10 +371,6 @@ static unsigned long mremap_to(unsigned long addr,
if ((addr <= new_addr) && (addr+old_len) > new_addr) if ((addr <= new_addr) && (addr+old_len) > new_addr)
goto out; goto out;
ret = security_mmap_addr(new_addr);
if (ret)
goto out;
ret = do_munmap(mm, new_addr, new_len); ret = do_munmap(mm, new_addr, new_len);
if (ret) if (ret)
goto out; goto out;
@ -532,9 +528,6 @@ SYSCALL_DEFINE5(mremap, unsigned long, addr, unsigned long, old_len,
goto out; goto out;
} }
ret = security_mmap_addr(new_addr);
if (ret)
goto out;
ret = move_vma(vma, addr, old_len, new_len, new_addr); ret = move_vma(vma, addr, old_len, new_len, new_addr);
} }
out: out: