diff options
| author | John Johansen <john.johansen@canonical.com> | 2013-10-08 05:37:26 -0700 |
|---|---|---|
| committer | John Johansen <john.johansen@canonical.com> | 2013-10-29 21:33:52 -0700 |
| commit | 61e3fb8acaea0ca4303ef123bae7edf8435dc2b7 (patch) | |
| tree | 434c0947a474470b8fc58e95074f40ff9e0613b8 | |
| parent | dd0c6e86f66080869ca0a48c78fb9bfbe4cf156f (diff) | |
apparmor: remove tsk field from the apparmor_audit_struct
Now that aa_capabile no longer sets the task field it can be removed
and the lsm_audit version of the field can be used.
Signed-off-by: John Johansen <john.johansen@canonical.com>
| -rw-r--r-- | security/apparmor/audit.c | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/security/apparmor/audit.c b/security/apparmor/audit.c index 031d2d9dd695..e32c4483fba1 100644 --- a/security/apparmor/audit.c +++ b/security/apparmor/audit.c @@ -111,7 +111,7 @@ 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->aad->tsk ? sa->aad->tsk : current; + struct task_struct *tsk = sa->u.tsk ? sa->u.tsk : current; if (aa_g_audit_header) { audit_log_format(ab, "apparmor="); @@ -149,12 +149,6 @@ static void audit_pre(struct audit_buffer *ab, void *ca) audit_log_format(ab, " name="); audit_log_untrustedstring(ab, sa->aad->name); } - - if (sa->aad->tsk) { - audit_log_format(ab, " pid=%d comm=", tsk->pid); - audit_log_untrustedstring(ab, tsk->comm); - } - } /** @@ -212,7 +206,7 @@ int aa_audit(int type, struct aa_profile *profile, gfp_t gfp, if (sa->aad->type == AUDIT_APPARMOR_KILL) (void)send_sig_info(SIGKILL, NULL, - sa->aad->tsk ? sa->aad->tsk : current); + sa->u.tsk ? sa->u.tsk : current); if (sa->aad->type == AUDIT_APPARMOR_ALLOWED) return complain_error(sa->aad->error); |