diff options
author | Al Viro <viro@zeniv.linux.org.uk> | 2012-02-23 22:29:17 -0500 |
---|---|---|
committer | Al Viro <viro@zeniv.linux.org.uk> | 2012-03-20 21:29:51 -0400 |
commit | 19e5109fef2c368ab3f8a5157270f87f4a7c0326 (patch) | |
tree | 31142f922de19cedfe45f0caa660a6d58674d8cc /fs/binfmt_elf.c | |
parent | e59cc473cc603d562f2c80c12c943ef2a8cde6b2 (diff) |
take removal of PF_FORKNOEXEC to flush_old_exec()
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Diffstat (limited to 'fs/binfmt_elf.c')
-rw-r--r-- | fs/binfmt_elf.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/fs/binfmt_elf.c b/fs/binfmt_elf.c index f8ac4251877e..81878b78c9d4 100644 --- a/fs/binfmt_elf.c +++ b/fs/binfmt_elf.c | |||
@@ -712,7 +712,6 @@ static int load_elf_binary(struct linux_binprm *bprm, struct pt_regs *regs) | |||
712 | goto out_free_dentry; | 712 | goto out_free_dentry; |
713 | 713 | ||
714 | /* OK, This is the point of no return */ | 714 | /* OK, This is the point of no return */ |
715 | current->flags &= ~PF_FORKNOEXEC; | ||
716 | current->mm->def_flags = def_flags; | 715 | current->mm->def_flags = def_flags; |
717 | 716 | ||
718 | /* Do this immediately, since STACK_TOP as used in setup_arg_pages | 717 | /* Do this immediately, since STACK_TOP as used in setup_arg_pages |
@@ -934,7 +933,6 @@ static int load_elf_binary(struct linux_binprm *bprm, struct pt_regs *regs) | |||
934 | #endif /* ARCH_HAS_SETUP_ADDITIONAL_PAGES */ | 933 | #endif /* ARCH_HAS_SETUP_ADDITIONAL_PAGES */ |
935 | 934 | ||
936 | install_exec_creds(bprm); | 935 | install_exec_creds(bprm); |
937 | current->flags &= ~PF_FORKNOEXEC; | ||
938 | retval = create_elf_tables(bprm, &loc->elf_ex, | 936 | retval = create_elf_tables(bprm, &loc->elf_ex, |
939 | load_addr, interp_load_addr); | 937 | load_addr, interp_load_addr); |
940 | if (retval < 0) { | 938 | if (retval < 0) { |