Commit 96ecee29 authored by Eric W. Biederman's avatar Eric W. Biederman
Browse files

exec: Merge install_exec_creds into setup_new_exec 



The two functions are now always called one right after the
other so merge them together to make future maintenance easier.

Reviewed-by: default avatarKees Cook <keescook@chromium.org>
Reviewed-by: default avatarGreg Ungerer <gerg@linux-m68k.org>
Signed-off-by: default avatar"Eric W. Biederman" <ebiederm@xmission.com>
parent 1507b7a3

arch/x86/ia32/ia32_aout.c

+0 −1
Original line number Diff line number Diff line
@@ -140,7 +140,6 @@ static int load_aout_binary(struct linux_binprm *bprm) 
	set_personality_ia32(false);



	setup_new_exec(bprm);

	install_exec_creds(bprm);



	regs->cs = __USER32_CS;

	regs->r8 = regs->r9 = regs->r10 = regs->r11 = regs->r12 =

fs/binfmt_aout.c

+0 −1
Original line number Diff line number Diff line
@@ -162,7 +162,6 @@ static int load_aout_binary(struct linux_binprm * bprm) 
	set_personality(PER_LINUX);

#endif

	setup_new_exec(bprm);

	install_exec_creds(bprm);



	current->mm->end_code = ex.a_text +

		(current->mm->start_code = N_TXTADDR(ex));

fs/binfmt_elf.c

+0 −1
Original line number Diff line number Diff line
@@ -858,7 +858,6 @@ out_free_interp: 
		current->flags |= PF_RANDOMIZE;



	setup_new_exec(bprm);

	install_exec_creds(bprm);



	/* Do this so that we can load the interpreter, if need be.  We will

	   change some of these later */

fs/binfmt_elf_fdpic.c

+0 −1
Original line number Diff line number Diff line
@@ -353,7 +353,6 @@ static int load_elf_fdpic_binary(struct linux_binprm *bprm) 
		current->personality |= READ_IMPLIES_EXEC;



	setup_new_exec(bprm);

	install_exec_creds(bprm);



	set_binfmt(&elf_fdpic_format);

fs/binfmt_flat.c

+0 −1
Original line number Diff line number Diff line
@@ -541,7 +541,6 @@ static int load_flat_file(struct linux_binprm *bprm, 
		/* OK, This is the point of no return */

		set_personality(PER_LINUX_32BIT);

		setup_new_exec(bprm);

		install_exec_creds(bprm);

	}



	/*

CRA Git | Maintained and supported by SUSTech CRA and CCSE