forked from Minki/linux
take removal of PF_FORKNOEXEC to flush_old_exec()
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
This commit is contained in:
parent
e59cc473cc
commit
19e5109fef
@ -323,7 +323,6 @@ static int load_aout_binary(struct linux_binprm *bprm, struct pt_regs *regs)
|
|||||||
}
|
}
|
||||||
|
|
||||||
install_exec_creds(bprm);
|
install_exec_creds(bprm);
|
||||||
current->flags &= ~PF_FORKNOEXEC;
|
|
||||||
|
|
||||||
if (N_MAGIC(ex) == OMAGIC) {
|
if (N_MAGIC(ex) == OMAGIC) {
|
||||||
unsigned long text_addr, map_size;
|
unsigned long text_addr, map_size;
|
||||||
|
@ -267,7 +267,6 @@ static int load_aout_binary(struct linux_binprm * bprm, struct pt_regs * regs)
|
|||||||
}
|
}
|
||||||
|
|
||||||
install_exec_creds(bprm);
|
install_exec_creds(bprm);
|
||||||
current->flags &= ~PF_FORKNOEXEC;
|
|
||||||
|
|
||||||
if (N_MAGIC(ex) == OMAGIC) {
|
if (N_MAGIC(ex) == OMAGIC) {
|
||||||
unsigned long text_addr, map_size;
|
unsigned long text_addr, map_size;
|
||||||
|
@ -712,7 +712,6 @@ static int load_elf_binary(struct linux_binprm *bprm, struct pt_regs *regs)
|
|||||||
goto out_free_dentry;
|
goto out_free_dentry;
|
||||||
|
|
||||||
/* OK, This is the point of no return */
|
/* OK, This is the point of no return */
|
||||||
current->flags &= ~PF_FORKNOEXEC;
|
|
||||||
current->mm->def_flags = def_flags;
|
current->mm->def_flags = def_flags;
|
||||||
|
|
||||||
/* Do this immediately, since STACK_TOP as used in setup_arg_pages
|
/* 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)
|
|||||||
#endif /* ARCH_HAS_SETUP_ADDITIONAL_PAGES */
|
#endif /* ARCH_HAS_SETUP_ADDITIONAL_PAGES */
|
||||||
|
|
||||||
install_exec_creds(bprm);
|
install_exec_creds(bprm);
|
||||||
current->flags &= ~PF_FORKNOEXEC;
|
|
||||||
retval = create_elf_tables(bprm, &loc->elf_ex,
|
retval = create_elf_tables(bprm, &loc->elf_ex,
|
||||||
load_addr, interp_load_addr);
|
load_addr, interp_load_addr);
|
||||||
if (retval < 0) {
|
if (retval < 0) {
|
||||||
|
@ -335,8 +335,6 @@ static int load_elf_fdpic_binary(struct linux_binprm *bprm,
|
|||||||
current->mm->context.exec_fdpic_loadmap = 0;
|
current->mm->context.exec_fdpic_loadmap = 0;
|
||||||
current->mm->context.interp_fdpic_loadmap = 0;
|
current->mm->context.interp_fdpic_loadmap = 0;
|
||||||
|
|
||||||
current->flags &= ~PF_FORKNOEXEC;
|
|
||||||
|
|
||||||
#ifdef CONFIG_MMU
|
#ifdef CONFIG_MMU
|
||||||
elf_fdpic_arch_lay_out_mm(&exec_params,
|
elf_fdpic_arch_lay_out_mm(&exec_params,
|
||||||
&interp_params,
|
&interp_params,
|
||||||
@ -414,7 +412,6 @@ static int load_elf_fdpic_binary(struct linux_binprm *bprm,
|
|||||||
#endif
|
#endif
|
||||||
|
|
||||||
install_exec_creds(bprm);
|
install_exec_creds(bprm);
|
||||||
current->flags &= ~PF_FORKNOEXEC;
|
|
||||||
if (create_elf_fdpic_tables(bprm, current->mm,
|
if (create_elf_fdpic_tables(bprm, current->mm,
|
||||||
&exec_params, &interp_params) < 0)
|
&exec_params, &interp_params) < 0)
|
||||||
goto error_kill;
|
goto error_kill;
|
||||||
|
@ -902,7 +902,6 @@ static int load_flat_binary(struct linux_binprm * bprm, struct pt_regs * regs)
|
|||||||
libinfo.lib_list[j].start_data:UNLOADED_LIB;
|
libinfo.lib_list[j].start_data:UNLOADED_LIB;
|
||||||
|
|
||||||
install_exec_creds(bprm);
|
install_exec_creds(bprm);
|
||||||
current->flags &= ~PF_FORKNOEXEC;
|
|
||||||
|
|
||||||
set_binfmt(&flat_format);
|
set_binfmt(&flat_format);
|
||||||
|
|
||||||
|
@ -225,7 +225,6 @@ load_som_binary(struct linux_binprm * bprm, struct pt_regs * regs)
|
|||||||
goto out_free;
|
goto out_free;
|
||||||
|
|
||||||
/* OK, This is the point of no return */
|
/* OK, This is the point of no return */
|
||||||
current->flags &= ~PF_FORKNOEXEC;
|
|
||||||
current->personality = PER_HPUX;
|
current->personality = PER_HPUX;
|
||||||
setup_new_exec(bprm);
|
setup_new_exec(bprm);
|
||||||
|
|
||||||
|
@ -1110,7 +1110,7 @@ int flush_old_exec(struct linux_binprm * bprm)
|
|||||||
bprm->mm = NULL; /* We're using it now */
|
bprm->mm = NULL; /* We're using it now */
|
||||||
|
|
||||||
set_fs(USER_DS);
|
set_fs(USER_DS);
|
||||||
current->flags &= ~(PF_RANDOMIZE | PF_KTHREAD);
|
current->flags &= ~(PF_RANDOMIZE | PF_FORKNOEXEC | PF_KTHREAD);
|
||||||
flush_thread();
|
flush_thread();
|
||||||
current->personality &= ~bprm->per_clear;
|
current->personality &= ~bprm->per_clear;
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user