diff options
author | Jeff Garzik <jeff@garzik.org> | 2006-03-11 17:47:20 -0500 |
---|---|---|
committer | Jeff Garzik <jeff@garzik.org> | 2006-03-11 17:47:20 -0500 |
commit | d7fc3ca1cd0ecce82263299c6b1631fc83b0ec79 (patch) | |
tree | a6471779a25cf2794542f9441213f5aa5f337f2f /security | |
parent | fbfda6e71bbdd3b4d41a56c3f20f31762c455a5e (diff) | |
parent | ed62178589929d248a0aaf4018ca3867e2f96d9d (diff) |
Merge branch 'master'
Diffstat (limited to 'security')
-rw-r--r-- | security/selinux/hooks.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/security/selinux/hooks.c b/security/selinux/hooks.c index b7773bf68ef..b65c201e9ff 100644 --- a/security/selinux/hooks.c +++ b/security/selinux/hooks.c @@ -1262,7 +1262,7 @@ static int selinux_ptrace(struct task_struct *parent, struct task_struct *child) rc = task_has_perm(parent, child, PROCESS__PTRACE); /* Save the SID of the tracing process for later use in apply_creds. */ - if (!rc) + if (!(child->ptrace & PT_PTRACED) && !rc) csec->ptrace_sid = psec->sid; return rc; } |