diff --git a/[refs] b/[refs] index ea30a18fd495..091b85acb76b 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 33e9fc7d01269737cd5a3b6de1db9d0e796ab708 +refs/heads/master: 00cd5c37afd5f431ac186dd131705048c0a11fdb diff --git a/trunk/kernel/ptrace.c b/trunk/kernel/ptrace.c index 5f8d452e8111..dcc199c43a12 100644 --- a/trunk/kernel/ptrace.c +++ b/trunk/kernel/ptrace.c @@ -168,8 +168,6 @@ int ptrace_attach(struct task_struct *task) audit_ptrace(task); retval = -EPERM; - if (task->pid <= 1) - goto out; if (same_thread_group(task, current)) goto out; @@ -521,12 +519,6 @@ struct task_struct *ptrace_get_task_struct(pid_t pid) { struct task_struct *child; - /* - * Tracing init is not allowed. - */ - if (pid == 1) - return ERR_PTR(-EPERM); - read_lock(&tasklist_lock); child = find_task_by_vpid(pid); if (child)