adulau/aha
1
0
Fork 0
mirror of https://github.com/adulau/aha.git synced 2024-12-28 11:46:19 +00:00
Code Issues Projects Releases Packages Wiki Activity

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

Browse source 
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: David Howells <dhowells@redhat.com>
Tested-by: Mike Frysinger <vapier.adi@gmail.com>
Acked-by: Paul Mundt <lethal@linux-sh.org>
This commit is contained in:
David Howells 2009-01-08 12:04:47 +00:00
parent 38f714795b
commit f4bbf51050
1 changed files with 0 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
fs/binfmt_elf_fdpic.c
View file

@ -168,9 +168,6 @@ static int load_elf_fdpic_binary(struct linux_binprm *bprm,
struct elf_fdpic_params exec_params, interp_params; struct elf_fdpic_params exec_params, interp_params;
struct elf_phdr *phdr; struct elf_phdr *phdr;
unsigned long stack_size, entryaddr; unsigned long stack_size, entryaddr;
#ifndef CONFIG_MMU
unsigned long fullsize;
#endif
#ifdef ELF_FDPIC_PLAT_INIT #ifdef ELF_FDPIC_PLAT_INIT
unsigned long dynaddr; unsigned long dynaddr;
#endif #endif
@ -390,11 +387,6 @@ static int load_elf_fdpic_binary(struct linux_binprm *bprm,
goto error_kill; 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); up_write(&current->mm->mmap_sem);
current->mm->brk = current->mm->start_brk; current->mm->brk = current->mm->start_brk;