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

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

Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gerg/m68knommu 

Pull m68knommu/coldfire fix from Greg Ungerer:
 "Only a single patch, fixes brk area setup problem in nommu
  environments"

* 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gerg/m68knommu:
  fs/binfmt_elf_fdpic.c: fix brk area overlap with stack on NOMMU
parents 50c36504 4ac31311

fs/binfmt_elf_fdpic.c

+1 −6
Original line number Original line Diff line number Diff line
@@ -374,10 +374,7 @@ static int load_elf_fdpic_binary(struct linux_binprm *bprm) 
		PAGE_ALIGN(current->mm->start_brk);

		PAGE_ALIGN(current->mm->start_brk);





#else

#else

	/* create a stack and brk area big enough for everyone

	/* create a stack area and zero-size brk area */

	 * - the brk heap starts at the bottom and works up

	 * - the stack starts at the top and works down

	 */

	stack_size = (stack_size + PAGE_SIZE - 1) & PAGE_MASK;

	stack_size = (stack_size + PAGE_SIZE - 1) & PAGE_MASK;

	if (stack_size < PAGE_SIZE * 2)

	if (stack_size < PAGE_SIZE * 2)

		stack_size = PAGE_SIZE * 2;

		stack_size = PAGE_SIZE * 2;
@@ -400,8 +397,6 @@ static int load_elf_fdpic_binary(struct linux_binprm *bprm) 




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

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

	current->mm->context.end_brk = current->mm->start_brk;

	current->mm->context.end_brk = current->mm->start_brk;

	current->mm->context.end_brk +=

		(stack_size > PAGE_SIZE) ? (stack_size - PAGE_SIZE) : 0;

	current->mm->start_stack = current->mm->start_brk + stack_size;

	current->mm->start_stack = current->mm->start_brk + stack_size;

#endif

#endif