diff options
author | John Johansen <john.johansen@canonical.com> | 2013-10-08 08:39:02 -0400 |
---|---|---|
committer | John Johansen <john.johansen@canonical.com> | 2013-10-30 00:34:04 -0400 |
commit | 4a7fc3018f05f4305723b508b12f3be13b7c4875 (patch) | |
tree | cbb27bfd27362dadffb4850f79c49897a2ec2552 /security/apparmor | |
parent | 61e3fb8acaea0ca4303ef123bae7edf8435dc2b7 (diff) |
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[] = { | |||
111 | static void audit_pre(struct audit_buffer *ab, void *ca) | 111 | static void audit_pre(struct audit_buffer *ab, void *ca) |
112 | { | 112 | { |
113 | struct common_audit_data *sa = ca; | 113 | struct common_audit_data *sa = ca; |
114 | struct task_struct *tsk = sa->u.tsk ? sa->u.tsk : current; | ||
115 | 114 | ||
116 | if (aa_g_audit_header) { | 115 | if (aa_g_audit_header) { |
117 | audit_log_format(ab, "apparmor="); | 116 | audit_log_format(ab, "apparmor="); |
@@ -132,11 +131,6 @@ static void audit_pre(struct audit_buffer *ab, void *ca) | |||
132 | 131 | ||
133 | if (sa->aad->profile) { | 132 | if (sa->aad->profile) { |
134 | struct aa_profile *profile = sa->aad->profile; | 133 | struct aa_profile *profile = sa->aad->profile; |
135 | pid_t pid; | ||
136 | rcu_read_lock(); | ||
137 | pid = rcu_dereference(tsk->real_parent)->pid; | ||
138 | rcu_read_unlock(); | ||
139 | audit_log_format(ab, " parent=%d", pid); | ||
140 | if (profile->ns != root_ns) { | 134 | if (profile->ns != root_ns) { |
141 | audit_log_format(ab, " namespace="); | 135 | audit_log_format(ab, " namespace="); |
142 | audit_log_untrustedstring(ab, profile->ns->base.hname); | 136 | 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 { | |||
109 | void *profile; | 109 | void *profile; |
110 | const char *name; | 110 | const char *name; |
111 | const char *info; | 111 | const char *info; |
112 | struct task_struct *tsk; | ||
113 | union { | 112 | union { |
114 | void *target; | 113 | void *target; |
115 | struct { | 114 | struct { |