diff for duplicates of <20220504224058.476193-9-ebiederm@xmission.com>
diff --git a/a/1.txt b/N1/1.txt
index 09c1bcd..dc47da9 100644
--- a/a/1.txt
+++ b/N1/1.txt
@@ -183,4 +183,10 @@ index 16828fde5424..e0b416b21ad3 100644
/*
* Queued signals ignored us while we were stopped for tracing.
--
-2.35.3
\ No newline at end of file
+2.35.3
+
+
+_______________________________________________
+linux-um mailing list
+linux-um@lists.infradead.org
+http://lists.infradead.org/mailman/listinfo/linux-um
\ No newline at end of file
diff --git a/a/content_digest b/N1/content_digest
index 482159e..6834866 100644
--- a/a/content_digest
+++ b/N1/content_digest
@@ -230,7 +230,13 @@
" \t/*\n",
" \t * Queued signals ignored us while we were stopped for tracing.\n",
"-- \n",
- "2.35.3"
+ "2.35.3\n",
+ "\n",
+ "\n",
+ "_______________________________________________\n",
+ "linux-um mailing list\n",
+ "linux-um\@lists.infradead.org\n",
+ "http://lists.infradead.org/mailman/listinfo/linux-um"
]
-3ca28a68fb10c399f21f00333e78edaa4a195b7c2d90439ce0115ec6def0a69f
+9e23fc262ac6a49357cfc3692500dbec0357f9082cba6138d8f2b2c1dc8cfe9c
diff --git a/a/1.txt b/N2/1.txt
index 09c1bcd..c2be9fc 100644
--- a/a/1.txt
+++ b/N2/1.txt
@@ -116,7 +116,7 @@ index 05953ac9f7bd..83ed28262708 100644
+ * 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;
if (__fatal_signal_pending(task))
@@ -132,8 +132,8 @@ index 05953ac9f7bd..83ed28262708 100644
@@ -256,7 +252,6 @@ static int ptrace_check_attach(struct task_struct *child, bool ignore_state)
*/
read_lock(&tasklist_lock);
- if (child->ptrace && child->parent == current) {
-- WARN_ON(READ_ONCE(child->__state) == __TASK_TRACED);
+ if (child->ptrace && child->parent = current) {
+- WARN_ON(READ_ONCE(child->__state) = __TASK_TRACED);
/*
* child->sighand can't be NULL, release_task()
* does ptrace_unlink() before __exit_signal().
diff --git a/a/content_digest b/N2/content_digest
index 482159e..8490339 100644
--- a/a/content_digest
+++ b/N2/content_digest
@@ -8,7 +8,7 @@
"Subject\0[PATCH v3 09/11] ptrace: Don't change __state\0"
]
[
- "Date\0Wed, 4 May 2022 17:40:56 -0500\0"
+ "Date\0Wed, 04 May 2022 22:40:56 +0000\0"
]
[
"To\0linux-kernel\@vger.kernel.org\0"
@@ -163,7 +163,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",
" \t\tif (__fatal_signal_pending(task))\n",
@@ -179,8 +179,8 @@
"\@\@ -256,7 +252,6 \@\@ static int ptrace_check_attach(struct task_struct *child, bool ignore_state)\n",
" \t */\n",
" \tread_lock(&tasklist_lock);\n",
- " \tif (child->ptrace && child->parent == current) {\n",
- "-\t\tWARN_ON(READ_ONCE(child->__state) == __TASK_TRACED);\n",
+ " \tif (child->ptrace && child->parent = current) {\n",
+ "-\t\tWARN_ON(READ_ONCE(child->__state) = __TASK_TRACED);\n",
" \t\t/*\n",
" \t\t * child->sighand can't be NULL, release_task()\n",
" \t\t * does ptrace_unlink() before __exit_signal().\n",
@@ -233,4 +233,4 @@
"2.35.3"
]
-3ca28a68fb10c399f21f00333e78edaa4a195b7c2d90439ce0115ec6def0a69f
+db95322ebed7ce500d0029513804fdc3ff2d997f83b074dde72dbb1dcc4ceb17
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.