Attachment 179961 Details for Bug 248532 – draft kernel patch to fix the bug

[patch] draft kernel patch to fix the bug

patch-248532 (text/plain), 1.90 KB, created by Roland McGrath on 2007-08-29 23:20:21 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Roland McGrath

Created: 2007-08-29 23:20:21 UTC

Size: 1.90 KB

patch

obsolete

>diff --git a/kernel/ptrace.c b/kernel/ptrace.c
>index 11cf680..0000000 100644  
>--- a/kernel/ptrace.c
>+++ b/kernel/ptrace.c
>@@ -375,8 +375,6 @@ static int ptrace_attach(struct task_str
> 	if (retval)
> 		(void) utrace_detach(task, engine);
> 	else {
>-		int stopped = 0;
>-
> 		NO_LOCKS;
> 
> 		/*
>@@ -386,48 +384,14 @@ static int ptrace_attach(struct task_str
> 		 * We cannot call into the signal code if it's dead.
> 		 */
> 		read_lock(&tasklist_lock);
>-		if (likely(!task->exit_state)) {
>+		if (likely(!task->exit_state))
> 			force_sig_specific(SIGSTOP, task);
>-
>-			spin_lock_irq(&task->sighand->siglock);
>-			stopped = (task->state == TASK_STOPPED);
>-			spin_unlock_irq(&task->sighand->siglock);
>-		}
> 		read_unlock(&tasklist_lock);
> 
>-		if (stopped) {
>-			const struct utrace_regset *regset;
>-
>-			/*
>-			 * Set QUIESCE immediately, so we can allow
>-			 * ptrace requests while he's in TASK_STOPPED.
>-			 */
>-			retval = ptrace_update(task, state, /* XXX child death+other thread waits race could have freed state already */
>-					       UTRACE_ACTION_QUIESCE, 0);
>-			if (retval)
>-				/*
>-				 * Anything is possible here.  It might not
>-				 * really have been quiescent yet.  It
>-				 * might have just woken up and died.
>-				 */
>-				BUG_ON(retval != -ESRCH && retval != -EALREADY);
>-			retval = 0;
>-
>-			/*
>-			 * Do now the regset 0 writeback that we do on every
>-			 * stop, since it's never been done.  On register
>-			 * window machines, this makes sure the user memory
>-			 * backing the register data is up to date.
>-			 */
>-			regset = utrace_regset(task, engine,
>-					       utrace_native_view(task), 0);
>-			if (regset->writeback)
>-				(*regset->writeback)(task, regset, 1);
>-		}
>-
> 		pr_debug("%d ptrace_attach %d complete (%sstopped)"
> 			 " state %lu code %x",
>-			 current->pid, task->pid, stopped ? "" : "not ",
>+			 current->pid, task->pid,
>+			 task->state == TASK_STOPPED ? "" : "not ",
> 			 task->state, task->exit_code);
> 	}

Actions: View | Diff

Attachments on bug 248532: 159411 | 179961 | 181161 | 182321 | 182381 | 185931 | 187231 | 191741