Skip to contentSkip to conversation

Kill ancient crap in s390 compat mmap

RFC PATCH In review Al Viro 1 participant 1 message Dec 5, 2009

Subsystems (2)
lore
Share & tools
lore

Al Viro

author
#0 lore raw

RFC PATCH 10/18 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.

---
 arch/s390/kernel/compat_linux.c |    5 -----
 1 files changed, 0 insertions(+), 5 deletions(-)
arch/s390/kernel/compat_linux.c +0 -5
index 0debcec..c5a9fba 100644
@@ -701,11 +701,6 @@ static inline long do_mmap2(
 
 	down_write(&current->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(&current->mm->mmap_sem);
 
 	if (file)
Signature · 1 line
1.5.6.5