diff options
| author | Jeff Garzik <jeff@garzik.org> | 2006-03-11 19:21:17 -0500 |
|---|---|---|
| committer | Jeff Garzik <jeff@garzik.org> | 2006-03-11 19:21:17 -0500 |
| commit | ce1e7a2ac721eb9d825b63f74752d0c9e0c635c2 (patch) | |
| tree | a7c0d18d6486734dffb9498e30db5b226b6e23bf /security/selinux/hooks.c | |
| parent | c2956a3b0d1c17b38da369811a6ce93eb7a01a04 (diff) | |
| parent | 75deb6fa985bd3162b9472f1fc394e23294da816 (diff) | |
Merge branch 'upstream'
Diffstat (limited to 'security/selinux/hooks.c')
| -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 b7773bf68efa..b65c201e9ff5 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) | |||
| 1262 | 1262 | ||
| 1263 | rc = task_has_perm(parent, child, PROCESS__PTRACE); | 1263 | rc = task_has_perm(parent, child, PROCESS__PTRACE); |
| 1264 | /* Save the SID of the tracing process for later use in apply_creds. */ | 1264 | /* Save the SID of the tracing process for later use in apply_creds. */ |
| 1265 | if (!rc) | 1265 | if (!(child->ptrace & PT_PTRACED) && !rc) |
| 1266 | csec->ptrace_sid = psec->sid; | 1266 | csec->ptrace_sid = psec->sid; |
| 1267 | return rc; | 1267 | return rc; |
| 1268 | } | 1268 | } |