diff for duplicates of <20220502154708.GE17276@redhat.com> diff --git a/a/1.txt b/N1/1.txt index 99703ca..01f4c27 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -16,7 +16,7 @@ On 04/29, Eric W. Biederman wrote: > + * not set JOBCTL_PTRACE_FROZEN or enter __TASK_TRACED anew. > */ > - spin_lock_irq(&task->sighand->siglock); -> - if (READ_ONCE(task->__state) = __TASK_TRACED) { +> - if (READ_ONCE(task->__state) == __TASK_TRACED) { > + if (lock_task_sighand(task, &flags)) { > + task->jobctl &= ~JOBCTL_PTRACE_FROZEN; diff --git a/a/content_digest b/N1/content_digest index 2a28f07..f4771a1 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -2,7 +2,7 @@ "ref\020220429214837.386518-7-ebiederm@xmission.com\0" "From\0Oleg Nesterov <oleg@redhat.com>\0" "Subject\0Re: [PATCH v2 07/12] ptrace: Don't change __state\0" - "Date\0Mon, 02 May 2022 15:47:08 +0000\0" + "Date\0Mon, 2 May 2022 17:47:08 +0200\0" "To\0Eric W. Biederman <ebiederm@xmission.com>\0" "Cc\0linux-kernel@vger.kernel.org" rjw@rjwysocki.net @@ -46,7 +46,7 @@ "> +\t * not set JOBCTL_PTRACE_FROZEN or enter __TASK_TRACED anew.\n" "> \t */\n" "> -\tspin_lock_irq(&task->sighand->siglock);\n" - "> -\tif (READ_ONCE(task->__state) = __TASK_TRACED) {\n" + "> -\tif (READ_ONCE(task->__state) == __TASK_TRACED) {\n" "> +\tif (lock_task_sighand(task, &flags)) {\n" "> +\t\ttask->jobctl &= ~JOBCTL_PTRACE_FROZEN;\n" "\n" @@ -60,4 +60,4 @@ "\n" Oleg. -b3836420a96b654ca7bfec2163af3c9c1d916c4d5acc7b28b6bb76247b76cfd6 +6eb33163c3a837c5b82b3cc89a3817a7e6690358577badfe5455eff517a1fb09
diff --git a/a/1.txt b/N2/1.txt index 99703ca..6439372 100644 --- a/a/1.txt +++ b/N2/1.txt @@ -16,7 +16,7 @@ On 04/29, Eric W. Biederman wrote: > + * not set JOBCTL_PTRACE_FROZEN or enter __TASK_TRACED anew. > */ > - spin_lock_irq(&task->sighand->siglock); -> - if (READ_ONCE(task->__state) = __TASK_TRACED) { +> - if (READ_ONCE(task->__state) == __TASK_TRACED) { > + if (lock_task_sighand(task, &flags)) { > + task->jobctl &= ~JOBCTL_PTRACE_FROZEN; @@ -29,3 +29,9 @@ at the start makes sense, we can avoid lock_task_sighand() if the tracee was resumed. Oleg. + + +_______________________________________________ +linux-um mailing list +linux-um@lists.infradead.org +http://lists.infradead.org/mailman/listinfo/linux-um diff --git a/a/content_digest b/N2/content_digest index 2a28f07..ea9d165 100644 --- a/a/content_digest +++ b/N2/content_digest @@ -2,7 +2,7 @@ "ref\020220429214837.386518-7-ebiederm@xmission.com\0" "From\0Oleg Nesterov <oleg@redhat.com>\0" "Subject\0Re: [PATCH v2 07/12] ptrace: Don't change __state\0" - "Date\0Mon, 02 May 2022 15:47:08 +0000\0" + "Date\0Mon, 2 May 2022 17:47:08 +0200\0" "To\0Eric W. Biederman <ebiederm@xmission.com>\0" "Cc\0linux-kernel@vger.kernel.org" rjw@rjwysocki.net @@ -46,7 +46,7 @@ "> +\t * not set JOBCTL_PTRACE_FROZEN or enter __TASK_TRACED anew.\n" "> \t */\n" "> -\tspin_lock_irq(&task->sighand->siglock);\n" - "> -\tif (READ_ONCE(task->__state) = __TASK_TRACED) {\n" + "> -\tif (READ_ONCE(task->__state) == __TASK_TRACED) {\n" "> +\tif (lock_task_sighand(task, &flags)) {\n" "> +\t\ttask->jobctl &= ~JOBCTL_PTRACE_FROZEN;\n" "\n" @@ -58,6 +58,12 @@ "at the start makes sense, we can avoid lock_task_sighand() if the tracee\n" "was resumed.\n" "\n" - Oleg. + "Oleg.\n" + "\n" + "\n" + "_______________________________________________\n" + "linux-um mailing list\n" + "linux-um@lists.infradead.org\n" + http://lists.infradead.org/mailman/listinfo/linux-um -b3836420a96b654ca7bfec2163af3c9c1d916c4d5acc7b28b6bb76247b76cfd6 +3a07277209edabea090df3db3c073c626349127336220385852d7fe4f738ff7b
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.