The patch titled
Subject: exec-fix-dead-lock-in-de_thread-with-ptrace_attach-v9
has been added to the -mm tree. Its filename is
exec-fix-dead-lock-in-de_thread-with-ptrace_attach-v9.patch
This patch should soon appear at
https://ozlabs.org/~akpm/mmots/broken-out/exec-fix-dead-lock-in-de_thread-with-ptrace_attach-v9.patch
and later at
https://ozlabs.org/~akpm/mmotm/broken-out/exec-fix-dead-lock-in-de_thread-with-ptrace_attach-v9.patch
Before you just go and hit "reply", please:
a) Consider who else should be cc'ed
b) Prefer to cc a suitable mailing list as well
c) Ideally: find the original patch on the mailing list and do a
reply-to-all to that, adding suitable additional cc's
*** Remember to use Documentation/process/submit-checklist.rst when testing your code ***
The -mm tree is included into linux-next and is updated
there every 3-4 working days
------------------------------------------------------
From: Bernd Edlinger <bernd.edlinger@xxxxxxxxxx>
Subject: exec-fix-dead-lock-in-de_thread-with-ptrace_attach-v9
Link: https://lkml.kernel.org/r/AM8PR10MB470896FBC519ABCC20486958E4349@xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
Signed-off-by: Bernd Edlinger <bernd.edlinger@xxxxxxxxxx>
Cc: Alexander Viro <viro@xxxxxxxxxxxxxxxxxx>
Cc: Alexey Dobriyan <adobriyan@xxxxxxxxx>
Cc: Oleg Nesterov <oleg@xxxxxxxxxx>
Cc: Kees Cook <keescook@xxxxxxxxxxxx>
Cc: Andy Lutomirski <luto@xxxxxxxxxxxxxx>
Cc: Will Drewry <wad@xxxxxxxxxxxx>
Cc: Shuah Khan <shuah@xxxxxxxxxx>
Cc: Christian Brauner <christian.brauner@xxxxxxxxxx>
Cc: Michal Hocko <mhocko@xxxxxxxx>
Cc: Serge Hallyn <serge@xxxxxxxxxx>
Cc: James Morris <jamorris@xxxxxxxxxxxxxxxxxxx>
Cc: "Eric W. Biederman" <ebiederm@xxxxxxxxxxxx>
Cc: Charles Haithcock <chaithco@xxxxxxxxxx>
Cc: Suren Baghdasaryan <surenb@xxxxxxxxxx>
Cc: Yafang Shao <laoar.shao@xxxxxxxxx>
Cc: Helge Deller <deller@xxxxxx>
Cc: YiFei Zhu <yifeifz2@xxxxxxxxxxxx>
Cc: Adrian Reber <areber@xxxxxxxxxx>
Cc: Thomas Gleixner <tglx@xxxxxxxxxxxxx>
Cc: Jens Axboe <axboe@xxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
fs/exec.c | 26 ++++++++++++++------------
1 file changed, 14 insertions(+), 12 deletions(-)
--- a/fs/exec.c~exec-fix-dead-lock-in-de_thread-with-ptrace_attach-v9
+++ a/fs/exec.c
@@ -1056,29 +1056,31 @@ static int de_thread(struct task_struct
return -EAGAIN;
}
- while_each_thread(tsk, t) {
- if (unlikely(t->ptrace) && t != tsk->group_leader)
- sig->unsafe_execve_in_progress = true;
- }
-
sig->group_exit_task = tsk;
sig->notify_count = zap_other_threads(tsk);
if (!thread_group_leader(tsk))
sig->notify_count--;
- spin_unlock_irq(lock);
- if (unlikely(sig->unsafe_execve_in_progress))
+ while_each_thread(tsk, t) {
+ if (unlikely(t->ptrace) && t != tsk->group_leader)
+ sig->unsafe_execve_in_progress = true;
+ }
+
+ if (unlikely(sig->unsafe_execve_in_progress)) {
+ spin_unlock_irq(lock);
mutex_unlock(&sig->cred_guard_mutex);
+ spin_lock_irq(lock);
+ }
- for (;;) {
- set_current_state(TASK_KILLABLE);
- if (!sig->notify_count)
- break;
+ while (sig->notify_count) {
+ __set_current_state(TASK_KILLABLE);
+ spin_unlock_irq(lock);
schedule();
if (__fatal_signal_pending(tsk))
goto killed;
+ spin_lock_irq(lock);
}
- __set_current_state(TASK_RUNNING);
+ spin_unlock_irq(lock);
if (unlikely(sig->unsafe_execve_in_progress)) {
if (mutex_lock_killable(&sig->cred_guard_mutex))
_
Patches currently in -mm which might be from bernd.edlinger@xxxxxxxxxx are
exec-fix-dead-lock-in-de_thread-with-ptrace_attach.patch
exec-fix-dead-lock-in-de_thread-with-ptrace_attach-v9.patch
