1 files changed, 20 insertions, 22 deletions

diff --git a/security/apparmor/audit.c b/security/apparmor/audit.c
index 5ff67776a5ad..cc3520d39a78 100644
--- a/security/apparmor/audit.c
+++ b/security/apparmor/audit.c
@@ -115,23 +115,23 @@ static void audit_pre(struct audit_buffer *ab, void *ca)
 
         if (aa_g_audit_header) {
                 audit_log_format(ab, "apparmor=");
-                audit_log_string(ab, aa_audit_type[sa->aad.type]);
+                audit_log_string(ab, aa_audit_type[sa->aad->type]);
         }
 
-        if (sa->aad.op) {
+        if (sa->aad->op) {
                 audit_log_format(ab, " operation=");
-                audit_log_string(ab, op_table[sa->aad.op]);
+                audit_log_string(ab, op_table[sa->aad->op]);
         }
 
-        if (sa->aad.info) {
+        if (sa->aad->info) {
                 audit_log_format(ab, " info=");
-                audit_log_string(ab, sa->aad.info);
-                if (sa->aad.error)
-                        audit_log_format(ab, " error=%d", sa->aad.error);
+                audit_log_string(ab, sa->aad->info);
+                if (sa->aad->error)
+                        audit_log_format(ab, " error=%d", sa->aad->error);
         }
 
-        if (sa->aad.profile) {
-                struct aa_profile *profile = sa->aad.profile;
+        if (sa->aad->profile) {
+                struct aa_profile *profile = sa->aad->profile;
                 pid_t pid;
                 rcu_read_lock();
                 pid = rcu_dereference(tsk->real_parent)->pid;
@@ -145,9 +145,9 @@ static void audit_pre(struct audit_buffer *ab, void *ca)
                 audit_log_untrustedstring(ab, profile->base.hname);
         }
 
-        if (sa->aad.name) {
+        if (sa->aad->name) {
                 audit_log_format(ab, " name=");
-                audit_log_untrustedstring(ab, sa->aad.name);
+                audit_log_untrustedstring(ab, sa->aad->name);
         }
 }
 
@@ -159,10 +159,8 @@ static void audit_pre(struct audit_buffer *ab, void *ca)
 void aa_audit_msg(int type, struct common_audit_data *sa,
                   void (*cb) (struct audit_buffer *, void *))
 {
-        sa->aad.type = type;
-        sa->lsm_pre_audit = audit_pre;
-        sa->lsm_post_audit = cb;
-        common_lsm_audit(sa);
+        sa->aad->type = type;
+        common_lsm_audit(sa, audit_pre, cb);
 }
 
 /**
@@ -184,7 +182,7 @@ int aa_audit(int type, struct aa_profile *profile, gfp_t gfp,
         BUG_ON(!profile);
 
         if (type == AUDIT_APPARMOR_AUTO) {
-                if (likely(!sa->aad.error)) {
+                if (likely(!sa->aad->error)) {
                         if (AUDIT_MODE(profile) != AUDIT_ALL)
                                 return 0;
                         type = AUDIT_APPARMOR_AUDIT;
@@ -196,21 +194,21 @@ int aa_audit(int type, struct aa_profile *profile, gfp_t gfp,
         if (AUDIT_MODE(profile) == AUDIT_QUIET ||
             (type == AUDIT_APPARMOR_DENIED &&
              AUDIT_MODE(profile) == AUDIT_QUIET))
-                return sa->aad.error;
+                return sa->aad->error;
 
         if (KILL_MODE(profile) && type == AUDIT_APPARMOR_DENIED)
                 type = AUDIT_APPARMOR_KILL;
 
         if (!unconfined(profile))
-                sa->aad.profile = profile;
+                sa->aad->profile = profile;
 
         aa_audit_msg(type, sa, cb);
 
-        if (sa->aad.type == AUDIT_APPARMOR_KILL)
+        if (sa->aad->type == AUDIT_APPARMOR_KILL)
                 (void)send_sig_info(SIGKILL, NULL, sa->tsk ? sa->tsk : current);
 
-        if (sa->aad.type == AUDIT_APPARMOR_ALLOWED)
-                return complain_error(sa->aad.error);
+        if (sa->aad->type == AUDIT_APPARMOR_ALLOWED)
+                return complain_error(sa->aad->error);
 
-        return sa->aad.error;
+        return sa->aad->error;
 }