diff options
| author | Al Viro <viro@zeniv.linux.org.uk> | 2009-11-30 22:52:36 +0100 |
|---|---|---|
| committer | Al Viro <viro@zeniv.linux.org.uk> | 2009-12-11 12:34:09 +0100 |
| commit | 570dcf2c15463842e384eb597a87c1e39bead99b (patch) | |
| tree | b513a2b21a376d656a3f25a939be4610d1a8f08a /arch/s390/kernel/compat_linux.c | |
| parent | arm: add arch_mmap_check(), get rid of sys_arm_mremap() (diff) | |
| download | linux-570dcf2c15463842e384eb597a87c1e39bead99b.tar.xz linux-570dcf2c15463842e384eb597a87c1e39bead99b.zip | |
Kill ancient crap in s390 compat mmap
We've had TASK_SIZE set to 1<<31 for 31bit tasks since May 2004.
Before that old32_mmap() had to deal with do_mmap_pgoff() giving
it an address out of range. It had tried to do that by checking
return value and doing do_munmap() (at wrong address, BTW).
IOW, that code had been dead for 5.5 years (and bogus - for 8).
Kill.
Acked-by: Hugh Dickins <hugh.dickins@tiscali.co.uk>
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Diffstat (limited to 'arch/s390/kernel/compat_linux.c')
| -rw-r--r-- | arch/s390/kernel/compat_linux.c | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/arch/s390/kernel/compat_linux.c b/arch/s390/kernel/compat_linux.c index 25c31d681402..11556aa6bf17 100644 --- a/arch/s390/kernel/compat_linux.c +++ b/arch/s390/kernel/compat_linux.c @@ -642,11 +642,6 @@ static inline long do_mmap2( down_write(¤t->mm->mmap_sem); error = do_mmap_pgoff(file, addr, len, prot, flags, pgoff); - if (!IS_ERR((void *) error) && error + len >= 0x80000000ULL) { - /* Result is out of bounds. */ - do_munmap(current->mm, addr, len); - error = -ENOMEM; - } up_write(¤t->mm->mmap_sem); if (file) |