Looks like we fixed only part of the problem earlier. When the child
moves away from ptrace notify and resets the last_siginfo, sighand lock
helps. But if the child goes further in exit and releases the sighand,
we need to test that case too.See ptrace_check_attach() and exit_sighand().
They also use the task_list_lock.


Signed-Off-by: Prasanna Meda <pmeda@akamai.com>


--- a/kernel/ptrace.c	Sun Jan 16 10:57:30 2005
+++ b/kernel/ptrace.c	Sun Jan 16 11:59:03 2005
@@ -320,32 +320,44 @@
 static int ptrace_getsiginfo(struct task_struct *child, siginfo_t __user * data)
 {
 	siginfo_t lastinfo;
+	int error = -ESRCH;
 
-	spin_lock_irq(&child->sighand->siglock);
-	if (likely(child->last_siginfo != NULL)) {
-		memcpy(&lastinfo, child->last_siginfo, sizeof (siginfo_t));
-		spin_unlock_irq(&child->sighand->siglock);
-		return copy_siginfo_to_user(data, &lastinfo);
+	read_lock_irq(&tasklist_lock);
+	if (likely(child->sighand != NULL)) {
+		error = -EINVAL;
+		spin_lock(&child->sighand->siglock);
+		if (likely(child->last_siginfo != NULL)) {
+			memcpy(&lastinfo, child->last_siginfo, sizeof (siginfo_t));
+			error = 0;
+		}
+		spin_unlock(&child->sighand->siglock);
 	}
-	spin_unlock_irq(&child->sighand->siglock);
-	return -EINVAL;
+	read_unlock_irq(&tasklist_lock);
+	if (!error)
+		return copy_siginfo_to_user(data, &lastinfo);
+	return error;
 }
 
 static int ptrace_setsiginfo(struct task_struct *child, siginfo_t __user * data)
 {
 	siginfo_t newinfo;
+	int error = -ESRCH;
 
-	if (copy_from_user(&newinfo, data, sizeof (siginfo_t)) != 0)
+	if (copy_from_user(&newinfo, data, sizeof (siginfo_t)))
 		return -EFAULT;
 
-	spin_lock_irq(&child->sighand->siglock);
-	if (likely(child->last_siginfo != NULL)) {
-		memcpy(child->last_siginfo, &newinfo, sizeof (siginfo_t));
-		spin_unlock_irq(&child->sighand->siglock);
-		return 0;
+	read_lock_irq(&tasklist_lock);
+	if (likely(child->sighand != NULL)) {
+		error = -EINVAL;
+		spin_lock(&child->sighand->siglock);
+		if (likely(child->last_siginfo != NULL)) {
+			memcpy(child->last_siginfo, &newinfo, sizeof (siginfo_t));
+			error = 0;
+		}
+		spin_unlock(&child->sighand->siglock);
 	}
-	spin_unlock_irq(&child->sighand->siglock);
-	return -EINVAL;
+	read_unlock_irq(&tasklist_lock);
+	return error;
 }
 
 int ptrace_request(struct task_struct *child, long request,