Merge 47e61cadc7
("MIPS: fw: Allow firmware to pass a empty env") into android12-5.10-lts
Steps on the way to 5.10.180 to help resolve some testing errors. Change-Id: I291b51c58e5eeff603ad8bfa999b88c628b0fe8a Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
This commit is contained in:
@@ -448,6 +448,9 @@ EXPORT_SYMBOL_GPL(put_task_stack);
|
||||
|
||||
void free_task(struct task_struct *tsk)
|
||||
{
|
||||
#ifdef CONFIG_SECCOMP
|
||||
WARN_ON_ONCE(tsk->seccomp.filter);
|
||||
#endif
|
||||
cpufreq_task_times_exit(tsk);
|
||||
scs_release(tsk);
|
||||
|
||||
@@ -2307,12 +2310,6 @@ static __latent_entropy struct task_struct *copy_process(
|
||||
|
||||
spin_lock(¤t->sighand->siglock);
|
||||
|
||||
/*
|
||||
* Copy seccomp details explicitly here, in case they were changed
|
||||
* before holding sighand lock.
|
||||
*/
|
||||
copy_seccomp(p);
|
||||
|
||||
rseq_fork(p, clone_flags);
|
||||
|
||||
/* Don't start children in a dying pid namespace */
|
||||
@@ -2327,6 +2324,14 @@ static __latent_entropy struct task_struct *copy_process(
|
||||
goto bad_fork_cancel_cgroup;
|
||||
}
|
||||
|
||||
/* No more failure paths after this point. */
|
||||
|
||||
/*
|
||||
* Copy seccomp details explicitly here, in case they were changed
|
||||
* before holding sighand lock.
|
||||
*/
|
||||
copy_seccomp(p);
|
||||
|
||||
init_task_pid_links(p);
|
||||
if (likely(p->pid)) {
|
||||
ptrace_init_task(p, (clone_flags & CLONE_PTRACE) || trace);
|
||||
|
Reference in New Issue
Block a user