(on top of utrace-core.patch)
exclude_utrace() has no callers. exclude_ptrace() is called under
tasklist_lock + task_lock() but needs utrace->lock.
Remove this logic for now. We will either add utrace-ptrace or rework
this mutual exclusion later.
Signed-off-by: Oleg Nesterov <o...@redhat.com>
---
kernel/ptrace.c | 18 +-----------------
kernel/utrace.c | 8 --------
2 files changed, 1 insertion(+), 25 deletions(-)
--- PTRACE/kernel/ptrace.c~1_EXCLUDE 2009-05-03 19:28:47.000000000 +0200
+++ PTRACE/kernel/ptrace.c 2009-05-03 19:30:15.000000000 +0200
@@ -16,7 +16,6 @@
#include <linux/pagemap.h>
#include <linux/smp_lock.h>
#include <linux/ptrace.h>
-#include <linux/utrace.h>
#include <linux/security.h>
#include <linux/signal.h>
#include <linux/audit.h>
@@ -175,14 +174,6 @@ bool ptrace_may_access(struct task_struc
return !err;
}
-/*
- * For experimental use of utrace, exclude ptrace on the same task.
- */
-static inline bool exclude_ptrace(struct task_struct *task)
-{
- return unlikely(!!task_utrace_flags(task));
-}
-
int ptrace_attach(struct task_struct *task)
{
int retval;
@@ -221,11 +212,6 @@ repeat:
goto repeat;
}
- if (exclude_ptrace(task)) {
- retval = -EBUSY;
- goto bad;
- }
-
if (!task->mm)
goto bad;
/* the same process cannot be attached many times */
@@ -602,9 +588,7 @@ int ptrace_traceme(void)
*/
repeat:
task_lock(current);
- if (exclude_ptrace(current)) {
- ret = -EBUSY;
- } else if (!(current->ptrace & PT_PTRACED)) {
+ if (!(current->ptrace & PT_PTRACED)) {
/*
* See ptrace_attach() comments about the locking here.
*/
--- PTRACE/kernel/utrace.c~1_EXCLUDE 2009-04-29 14:26:52.000000000 +0200
+++ PTRACE/kernel/utrace.c 2009-05-03 19:29:56.000000000 +0200
@@ -108,14 +108,6 @@ static struct utrace_engine *matching_en
}
/*
- * For experimental use, utrace attach is mutually exclusive with ptrace.
- */
-static inline bool exclude_utrace(struct task_struct *task)
-{
- return unlikely(!!task->ptrace);
-}
-
-/*
* Called without locks, when we might be the first utrace engine to attach.
* If this is a newborn thread and we are not the creator, we have to wait
* for it. The creator gets the first chance to attach. The PF_STARTING
