---

yaml --- r: 95155 b: refs/heads/master c: 00cd5c3 h: refs/heads/master i: 95153: 273edf3 95151: 7dedeb5 v: v3
git-mirror · Apr 30, 2008 · e37e313 · e37e313
1 parent 813742a
commit e37e313
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 9 deletions.
diff --git 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
@@ -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)