diff options
Diffstat (limited to 'kernel/ptrace.c')
-rw-r--r-- | kernel/ptrace.c | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/kernel/ptrace.c b/kernel/ptrace.c index f62a568e84ec..ee553b6ad125 100644 --- a/kernel/ptrace.c +++ b/kernel/ptrace.c | |||
@@ -237,6 +237,8 @@ out: | |||
237 | 237 | ||
238 | int ptrace_detach(struct task_struct *child, unsigned int data) | 238 | int ptrace_detach(struct task_struct *child, unsigned int data) |
239 | { | 239 | { |
240 | int dead = 0; | ||
241 | |||
240 | if (!valid_signal(data)) | 242 | if (!valid_signal(data)) |
241 | return -EIO; | 243 | return -EIO; |
242 | 244 | ||
@@ -244,18 +246,21 @@ int ptrace_detach(struct task_struct *child, unsigned int data) | |||
244 | ptrace_disable(child); | 246 | ptrace_disable(child); |
245 | clear_tsk_thread_flag(child, TIF_SYSCALL_TRACE); | 247 | clear_tsk_thread_flag(child, TIF_SYSCALL_TRACE); |
246 | 248 | ||
247 | /* protect against de_thread()->release_task() */ | ||
248 | write_lock_irq(&tasklist_lock); | 249 | write_lock_irq(&tasklist_lock); |
250 | /* protect against de_thread()->release_task() */ | ||
249 | if (child->ptrace) { | 251 | if (child->ptrace) { |
250 | child->exit_code = data; | 252 | child->exit_code = data; |
251 | 253 | ||
252 | __ptrace_unlink(child); | 254 | dead = __ptrace_detach(current, child); |
253 | 255 | ||
254 | if (!child->exit_state) | 256 | if (!child->exit_state) |
255 | wake_up_process(child); | 257 | wake_up_process(child); |
256 | } | 258 | } |
257 | write_unlock_irq(&tasklist_lock); | 259 | write_unlock_irq(&tasklist_lock); |
258 | 260 | ||
261 | if (unlikely(dead)) | ||
262 | release_task(child); | ||
263 | |||
259 | return 0; | 264 | return 0; |
260 | } | 265 | } |
261 | 266 | ||