Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f4bbf510 authored by David Howells's avatar David Howells
Browse files

FDPIC: Don't attempt to expand the userspace stack to fill the space allocated 



Stop the ELF-FDPIC binfmt from attempting to expand the userspace stack and brk
segments to fill the space actually allocated for it.  The space allocated may
be rounded up by mmap(), and may be wasted.

However, finding out how much space we actually obtained uses the contentious
kobjsize() function which we'd like to get rid of as it doesn't necessarily
work for all slab allocators.

Signed-off-by: default avatarDavid Howells <dhowells@redhat.com>
Tested-by: default avatarMike Frysinger <vapier.adi@gmail.com>
Acked-by: default avatarPaul Mundt <lethal@linux-sh.org>
parent 38f71479

fs/binfmt_elf_fdpic.c

+0 −8
Original line number Diff line number Diff line
@@ -168,9 +168,6 @@ static int load_elf_fdpic_binary(struct linux_binprm *bprm, 
	struct elf_fdpic_params exec_params, interp_params;

	struct elf_phdr *phdr;

	unsigned long stack_size, entryaddr;

#ifndef CONFIG_MMU

	unsigned long fullsize;

#endif

#ifdef ELF_FDPIC_PLAT_INIT

	unsigned long dynaddr;

#endif
@@ -390,11 +387,6 @@ static int load_elf_fdpic_binary(struct linux_binprm *bprm, 
		goto error_kill;

	}



	/* expand the stack mapping to use up the entire allocation granule */

	fullsize = kobjsize((char *) current->mm->start_brk);

	if (!IS_ERR_VALUE(do_mremap(current->mm->start_brk, stack_size,

				    fullsize, 0, 0)))

		stack_size = fullsize;

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



	current->mm->brk = current->mm->start_brk;