diff options
| author | Steven Whitehouse <swhiteho@redhat.com> | 2006-03-20 12:47:40 -0500 |
|---|---|---|
| committer | Steven Whitehouse <swhiteho@redhat.com> | 2006-03-20 12:47:40 -0500 |
| commit | 9a21247181d93fdf99255911845ecdb041d21583 (patch) | |
| tree | 6d69be36f8a2bd8c76bf02ead2f0121a511c0a92 /security | |
| parent | c752666c17f870fa8ae9f16804dd457e9e6daaec (diff) | |
| parent | 7705a8792b0fc82fd7d4dd923724606bbfd9fb20 (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 b7773bf68e..b65c201e9f 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 | } |