From 940fcf586872216751fd7f6bc2146ad825bdf65c Mon Sep 17 00:00:00 2001 From: Matthew Wilcox Date: Thu, 6 Dec 2007 11:04:01 -0500 Subject: [PATCH] --- yaml --- r: 81757 b: refs/heads/master c: 6d8982d9b8f4b771754335f1398e406cc72003c3 h: refs/heads/master i: 81755: 6b9d5168b0d478b1915b7fc358bd2c4728eb6698 v: v3 --- [refs] | 2 +- trunk/fs/proc/base.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index bf17ae5e7915..a3d16f7bc654 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 1587e2b1880632d959db6ac9e79cb1d99a73c656 +refs/heads/master: 6d8982d9b8f4b771754335f1398e406cc72003c3 diff --git a/trunk/fs/proc/base.c b/trunk/fs/proc/base.c index 02a63ac04178..e88ee1a0323a 100644 --- a/trunk/fs/proc/base.c +++ b/trunk/fs/proc/base.c @@ -199,7 +199,7 @@ static int proc_root_link(struct inode *inode, struct dentry **dentry, struct vf (task == current || \ (task->parent == current && \ (task->ptrace & PT_PTRACED) && \ - (task->state == TASK_STOPPED || task->state == TASK_TRACED) && \ + (task_is_stopped_or_traced(task)) && \ security_ptrace(current,task) == 0)) static int proc_pid_cmdline(struct task_struct *task, char * buffer)