diff options
Diffstat (limited to 'kernel/ptrace.c')
-rw-r--r-- | kernel/ptrace.c | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/kernel/ptrace.c b/kernel/ptrace.c index b0d4ab4dfd3d..628b03ab88a5 100644 --- a/kernel/ptrace.c +++ b/kernel/ptrace.c | |||
@@ -20,6 +20,7 @@ | |||
20 | #include <linux/signal.h> | 20 | #include <linux/signal.h> |
21 | #include <linux/audit.h> | 21 | #include <linux/audit.h> |
22 | #include <linux/pid_namespace.h> | 22 | #include <linux/pid_namespace.h> |
23 | #include <linux/syscalls.h> | ||
23 | 24 | ||
24 | #include <asm/pgtable.h> | 25 | #include <asm/pgtable.h> |
25 | #include <asm/uaccess.h> | 26 | #include <asm/uaccess.h> |
@@ -53,7 +54,7 @@ void ptrace_untrace(struct task_struct *child) | |||
53 | spin_lock(&child->sighand->siglock); | 54 | spin_lock(&child->sighand->siglock); |
54 | if (task_is_traced(child)) { | 55 | if (task_is_traced(child)) { |
55 | if (child->signal->flags & SIGNAL_STOP_STOPPED) { | 56 | if (child->signal->flags & SIGNAL_STOP_STOPPED) { |
56 | child->state = TASK_STOPPED; | 57 | __set_task_state(child, TASK_STOPPED); |
57 | } else { | 58 | } else { |
58 | signal_wake_up(child, 1); | 59 | signal_wake_up(child, 1); |
59 | } | 60 | } |
@@ -103,18 +104,16 @@ int ptrace_check_attach(struct task_struct *child, int kill) | |||
103 | && child->signal != NULL) { | 104 | && child->signal != NULL) { |
104 | ret = 0; | 105 | ret = 0; |
105 | spin_lock_irq(&child->sighand->siglock); | 106 | spin_lock_irq(&child->sighand->siglock); |
106 | if (task_is_stopped(child)) { | 107 | if (task_is_stopped(child)) |
107 | child->state = TASK_TRACED; | 108 | child->state = TASK_TRACED; |
108 | } else if (!task_is_traced(child) && !kill) { | 109 | else if (!task_is_traced(child) && !kill) |
109 | ret = -ESRCH; | 110 | ret = -ESRCH; |
110 | } | ||
111 | spin_unlock_irq(&child->sighand->siglock); | 111 | spin_unlock_irq(&child->sighand->siglock); |
112 | } | 112 | } |
113 | read_unlock(&tasklist_lock); | 113 | read_unlock(&tasklist_lock); |
114 | 114 | ||
115 | if (!ret && !kill) { | 115 | if (!ret && !kill) |
116 | wait_task_inactive(child); | 116 | wait_task_inactive(child); |
117 | } | ||
118 | 117 | ||
119 | /* All systems go.. */ | 118 | /* All systems go.. */ |
120 | return ret; | 119 | return ret; |