Commit aad3bf04 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge git://git.kernel.org/pub/scm/linux/kernel/git/viro/mmap 

* git://git.kernel.org/pub/scm/linux/kernel/git/viro/mmap:
  Add missing alignment check in arch/score sys_mmap()
  fix broken aliasing checks for MAP_FIXED on sparc32, mips, arm and sh
  Get rid of open-coding in ia64_brk()
  sparc_brk() is not needed anymore
  switch do_brk() to get_unmapped_area()
  Take arch_mmap_check() into get_unmapped_area()
  fix a struct file leak in do_mmap_pgoff()
  Unify sys_mmap*
  Cut hugetlb case early for 32bit on ia64
  arch_mmap_check() on mn10300
  Kill ancient crap in s390 compat mmap
  arm: add arch_mmap_check(), get rid of sys_arm_mremap()
  file ->get_unmapped_area() shouldn't duplicate work of get_unmapped_area()
  kill useless checks in sparc mremap variants
  fix pgoff in "have to relocate" case of mremap()
  fix the arch checks in MREMAP_FIXED case
  fix checks for expand-in-place mremap
  do_mremap() untangling, part 3
  do_mremap() untangling, part 2
  untangling do_mremap(), part 1
parents 11bd04f6 aa656073

arch/alpha/kernel/osf_sys.c

+6 −13
Original line number Diff line number Diff line
@@ -178,25 +178,18 @@ SYSCALL_DEFINE6(osf_mmap, unsigned long, addr, unsigned long, len, 
		unsigned long, prot, unsigned long, flags, unsigned long, fd,

		unsigned long, off)

{

	struct file *file = NULL;

	unsigned long ret = -EBADF;

	unsigned long ret = -EINVAL;



#if 0

	if (flags & (_MAP_HASSEMAPHORE | _MAP_INHERIT | _MAP_UNALIGNED))

		printk("%s: unimplemented OSF mmap flags %04lx\n", 

			current->comm, flags);

#endif

	if (!(flags & MAP_ANONYMOUS)) {

		file = fget(fd);

		if (!file)

	if ((off + PAGE_ALIGN(len)) < off)

		goto out;

	}

	flags &= ~(MAP_EXECUTABLE | MAP_DENYWRITE);

	down_write(&current->mm->mmap_sem);

	ret = do_mmap(file, addr, len, prot, flags, off);

	up_write(&current->mm->mmap_sem);

	if (file)

		fput(file);

	if (off & ~PAGE_MASK)

		goto out;

	ret = sys_mmap_pgoff(addr, len, prot, flags, fd, off >> PAGE_SHIFT);

 out:

	return ret;

}

arch/arm/include/asm/mman.h

+3 −0
Original line number Diff line number Diff line 
#include <asm-generic/mman.h>



#define arch_mmap_check(addr, len, flags) \

	(((flags) & MAP_FIXED && (addr) < FIRST_USER_ADDRESS) ? -EINVAL : 0)

arch/arm/kernel/calls.S

+1 −1
Original line number Diff line number Diff line
@@ -172,7 +172,7 @@ 
/* 160 */	CALL(sys_sched_get_priority_min)

		CALL(sys_sched_rr_get_interval)

		CALL(sys_nanosleep)

		CALL(sys_arm_mremap)

		CALL(sys_mremap)

		CALL(sys_setresuid16)

/* 165 */	CALL(sys_getresuid16)

		CALL(sys_ni_syscall)		/* vm86 */

arch/arm/kernel/entry-common.S

+2 −2
Original line number Diff line number Diff line
@@ -416,12 +416,12 @@ sys_mmap2: 
		tst	r5, #PGOFF_MASK

		moveq	r5, r5, lsr #PAGE_SHIFT - 12

		streq	r5, [sp, #4]

		beq	do_mmap2

		beq	sys_mmap_pgoff

		mov	r0, #-EINVAL

		mov	pc, lr

#else

		str	r5, [sp, #4]

		b	do_mmap2

		b	sys_mmap_pgoff

#endif

ENDPROC(sys_mmap2)

arch/arm/kernel/sys_arm.c

+1 −54
Original line number Diff line number Diff line
@@ -28,41 +28,6 @@ 
#include <linux/ipc.h>

#include <linux/uaccess.h>



extern unsigned long do_mremap(unsigned long addr, unsigned long old_len,

			       unsigned long new_len, unsigned long flags,

			       unsigned long new_addr);



/* common code for old and new mmaps */

inline long do_mmap2(

	unsigned long addr, unsigned long len,

	unsigned long prot, unsigned long flags,

	unsigned long fd, unsigned long pgoff)

{

	int error = -EINVAL;

	struct file * file = NULL;



	flags &= ~(MAP_EXECUTABLE | MAP_DENYWRITE);



	if (flags & MAP_FIXED && addr < FIRST_USER_ADDRESS)

		goto out;



	error = -EBADF;

	if (!(flags & MAP_ANONYMOUS)) {

		file = fget(fd);

		if (!file)

			goto out;

	}



	down_write(&current->mm->mmap_sem);

	error = do_mmap_pgoff(file, addr, len, prot, flags, pgoff);

	up_write(&current->mm->mmap_sem);



	if (file)

		fput(file);

out:

	return error;

}



struct mmap_arg_struct {

	unsigned long addr;

	unsigned long len;
@@ -84,29 +49,11 @@ asmlinkage int old_mmap(struct mmap_arg_struct __user *arg) 
	if (a.offset & ~PAGE_MASK)

		goto out;



	error = do_mmap2(a.addr, a.len, a.prot, a.flags, a.fd, a.offset >> PAGE_SHIFT);

	error = sys_mmap_pgoff(a.addr, a.len, a.prot, a.flags, a.fd, a.offset >> PAGE_SHIFT);

out:

	return error;

}



asmlinkage unsigned long

sys_arm_mremap(unsigned long addr, unsigned long old_len,

	       unsigned long new_len, unsigned long flags,

	       unsigned long new_addr)

{

	unsigned long ret = -EINVAL;



	if (flags & MREMAP_FIXED && new_addr < FIRST_USER_ADDRESS)

		goto out;



	down_write(&current->mm->mmap_sem);

	ret = do_mremap(addr, old_len, new_len, flags, new_addr);

	up_write(&current->mm->mmap_sem);



out:

	return ret;

}



/*

 * Perform the select(nd, in, out, ex, tv) and mmap() system

 * calls.

CRA Git | Maintained and supported by SUSTech CRA and CCSE