summaryrefslogtreecommitdiffstats
path: root/fs/binfmt_aout.c
diff options
context:
space:
mode:
authorEric W. Biederman <ebiederm@xmission.com>2020-05-03 06:48:17 -0500
committerEric W. Biederman <ebiederm@xmission.com>2020-05-07 16:55:47 -0500
commit96ecee29b0b560662ec082ee9b6f2049f2a79090 (patch)
tree96d03c2e68da53a482ee126b9363b67cad0ee8dd /fs/binfmt_aout.c
parent1507b7a30ad284a2a136ee79c214c0e86c62da64 (diff)
downloadlinux-stable-96ecee29b0b560662ec082ee9b6f2049f2a79090.tar.gz
linux-stable-96ecee29b0b560662ec082ee9b6f2049f2a79090.tar.bz2
linux-stable-96ecee29b0b560662ec082ee9b6f2049f2a79090.zip
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: Kees Cook <keescook@chromium.org> Reviewed-by: Greg Ungerer <gerg@linux-m68k.org> Signed-off-by: "Eric W. Biederman" <ebiederm@xmission.com>
Diffstat (limited to 'fs/binfmt_aout.c')
-rw-r--r--fs/binfmt_aout.c1
1 files changed, 0 insertions, 1 deletions
diff --git a/fs/binfmt_aout.c b/fs/binfmt_aout.c
index ace587b66904..c8ba28f285e5 100644
--- a/fs/binfmt_aout.c
+++ b/fs/binfmt_aout.c
@@ -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));