diff options
| author | Al Viro <viro@zeniv.linux.org.uk> | 2012-05-30 23:13:15 +0200 |
|---|---|---|
| committer | Al Viro <viro@zeniv.linux.org.uk> | 2012-06-01 16:37:16 +0200 |
| commit | 9ac4ed4bd0adec75db13a4b08a39a3918ec0e3c9 (patch) | |
| tree | 23aba68ec121692cd6f0449535524b6586e8914f /mm/mremap.c | |
| parent | take security_mmap_file() outside of ->mmap_sem (diff) | |
| download | linux-9ac4ed4bd0adec75db13a4b08a39a3918ec0e3c9.tar.xz linux-9ac4ed4bd0adec75db13a4b08a39a3918ec0e3c9.zip | |
move security_mmap_addr() to saner place
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>
Diffstat (limited to 'mm/mremap.c')
| -rw-r--r-- | mm/mremap.c | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/mm/mremap.c b/mm/mremap.c index ebf10892b63d..21fed202ddad 100644 --- a/mm/mremap.c +++ b/mm/mremap.c @@ -371,10 +371,6 @@ static unsigned long mremap_to(unsigned long addr, if ((addr <= new_addr) && (addr+old_len) > new_addr) goto out; - ret = security_mmap_addr(new_addr); - if (ret) - goto out; - ret = do_munmap(mm, new_addr, new_len); if (ret) goto out; @@ -532,9 +528,6 @@ SYSCALL_DEFINE5(mremap, unsigned long, addr, unsigned long, old_len, goto out; } - ret = security_mmap_addr(new_addr); - if (ret) - goto out; ret = move_vma(vma, addr, old_len, new_len, new_addr); } out: |