diff options
| author | John Johansen <john.johansen@canonical.com> | 2013-10-08 05:39:02 -0700 |
|---|---|---|
| committer | John Johansen <john.johansen@canonical.com> | 2013-10-29 21:34:04 -0700 |
| commit | 4a7fc3018f05f4305723b508b12f3be13b7c4875 (patch) | |
| tree | cbb27bfd27362dadffb4850f79c49897a2ec2552 /security/apparmor | |
| parent | 61e3fb8acaea0ca4303ef123bae7edf8435dc2b7 (diff) | |
| download | linux-4a7fc3018f05f4305723b508b12f3be13b7c4875.tar.bz2 | |
apparmor: remove parent task info from audit logging
The reporting of the parent task info is a vestage from old versions of
apparmor. The need for this information was removed by unique null-
profiles before apparmor was upstreamed so remove this info from logging.
Signed-off-by: John Johansen <john.johansen@canonical.com>
Diffstat (limited to 'security/apparmor')
| -rw-r--r-- | security/apparmor/audit.c | 6 | ||||
| -rw-r--r-- | security/apparmor/include/audit.h | 1 |
2 files changed, 0 insertions, 7 deletions
diff --git a/security/apparmor/audit.c b/security/apparmor/audit.c index e32c4483fba1..89c78658031f 100644 --- a/security/apparmor/audit.c +++ b/security/apparmor/audit.c @@ -111,7 +111,6 @@ static const char *const aa_audit_type[] = { static void audit_pre(struct audit_buffer *ab, void *ca) { struct common_audit_data *sa = ca; - struct task_struct *tsk = sa->u.tsk ? sa->u.tsk : current; if (aa_g_audit_header) { audit_log_format(ab, "apparmor="); @@ -132,11 +131,6 @@ static void audit_pre(struct audit_buffer *ab, void *ca) if (sa->aad->profile) { struct aa_profile *profile = sa->aad->profile; - pid_t pid; - rcu_read_lock(); - pid = rcu_dereference(tsk->real_parent)->pid; - rcu_read_unlock(); - audit_log_format(ab, " parent=%d", pid); if (profile->ns != root_ns) { audit_log_format(ab, " namespace="); audit_log_untrustedstring(ab, profile->ns->base.hname); diff --git a/security/apparmor/include/audit.h b/security/apparmor/include/audit.h index 30e8d7687259..ba3dfd17f23f 100644 --- a/security/apparmor/include/audit.h +++ b/security/apparmor/include/audit.h @@ -109,7 +109,6 @@ struct apparmor_audit_data { void *profile; const char *name; const char *info; - struct task_struct *tsk; union { void *target; struct { |