Merge tag 'v3.4-rc6' into gpio/next

Linux 3.4-rc6

1 files changed, 7 insertions, 7 deletions

diff --git a/security/smack/smack_access.c b/security/smack/smack_access.c
index cc7cb6edba08..c8115f7308f8 100644
--- a/security/smack/smack_access.c
+++ b/security/smack/smack_access.c
@@ -275,9 +275,9 @@ static inline void smack_str_from_perm(char *string, int access)
 static void smack_log_callback(struct audit_buffer *ab, void *a)
 {
         struct common_audit_data *ad = a;
-        struct smack_audit_data *sad = &ad->smack_audit_data;
+        struct smack_audit_data *sad = ad->smack_audit_data;
         audit_log_format(ab, "lsm=SMACK fn=%s action=%s",
-                         ad->smack_audit_data.function,
+                         ad->smack_audit_data->function,
                          sad->result ? "denied" : "granted");
         audit_log_format(ab, " subject=");
         audit_log_untrustedstring(ab, sad->subject);
@@ -310,19 +310,19 @@ void smack_log(char *subject_label, char *object_label, int request,
         if (result == 0 && (log_policy & SMACK_AUDIT_ACCEPT) == 0)
                 return;
 
-        if (a->smack_audit_data.function == NULL)
-                a->smack_audit_data.function = "unknown";
+        sad = a->smack_audit_data;
+
+        if (sad->function == NULL)
+                sad->function = "unknown";
 
         /* end preparing the audit data */
-        sad = &a->smack_audit_data;
         smack_str_from_perm(request_buffer, request);
         sad->subject = subject_label;
         sad->object  = object_label;
         sad->request = request_buffer;
         sad->result  = result;
-        a->lsm_pre_audit = smack_log_callback;
 
-        common_lsm_audit(a);
+        common_lsm_audit(a, smack_log_callback, NULL);
 }
 #else /* #ifdef CONFIG_AUDIT */
 void smack_log(char *subject_label, char *object_label, int request,