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

Commit 6414fa6a authored by Al Viro's avatar Al Viro Committed by Linus Torvalds
Browse files

aout: move setup_arg_pages() prior to reading/mapping the binary 



Signed-off-by: default avatarAl Viro <viro@zeniv.linux.org.uk>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 550cf00d

arch/x86/ia32/ia32_aout.c

+7 −7
Original line number Diff line number Diff line
@@ -315,6 +315,13 @@ static int load_aout_binary(struct linux_binprm *bprm, struct pt_regs *regs) 
	current->mm->free_area_cache = TASK_UNMAPPED_BASE;

	current->mm->cached_hole_size = 0;



	retval = setup_arg_pages(bprm, IA32_STACK_TOP, EXSTACK_DEFAULT);

	if (retval < 0) {

		/* Someone check-me: is this error path enough? */

		send_sig(SIGKILL, current, 0);

		return retval;

	}



	install_exec_creds(bprm);

	current->flags &= ~PF_FORKNOEXEC;
@@ -410,13 +417,6 @@ static int load_aout_binary(struct linux_binprm *bprm, struct pt_regs *regs) 


	set_brk(current->mm->start_brk, current->mm->brk);



	retval = setup_arg_pages(bprm, IA32_STACK_TOP, EXSTACK_DEFAULT);

	if (retval < 0) {

		/* Someone check-me: is this error path enough? */

		send_sig(SIGKILL, current, 0);

		return retval;

	}



	current->mm->start_stack =

		(unsigned long)create_aout_tables((char __user *)bprm->p, bprm);

	/* start thread */

fs/binfmt_aout.c

+7 −7
Original line number Diff line number Diff line
@@ -259,6 +259,13 @@ static int load_aout_binary(struct linux_binprm * bprm, struct pt_regs * regs) 
	current->mm->free_area_cache = current->mm->mmap_base;

	current->mm->cached_hole_size = 0;



	retval = setup_arg_pages(bprm, STACK_TOP, EXSTACK_DEFAULT);

	if (retval < 0) {

		/* Someone check-me: is this error path enough? */

		send_sig(SIGKILL, current, 0);

		return retval;

	}



	install_exec_creds(bprm);

 	current->flags &= ~PF_FORKNOEXEC;
@@ -352,13 +359,6 @@ static int load_aout_binary(struct linux_binprm * bprm, struct pt_regs * regs) 
		return retval;

	}



	retval = setup_arg_pages(bprm, STACK_TOP, EXSTACK_DEFAULT);

	if (retval < 0) { 

		/* Someone check-me: is this error path enough? */ 

		send_sig(SIGKILL, current, 0); 

		return retval;

	}



	current->mm->start_stack =

		(unsigned long) create_aout_tables((char __user *) bprm->p, bprm);

#ifdef __alpha__