15 files changed, 77 insertions, 69 deletions

diff --git a/include/linux/audit.h b/include/linux/audit.h
index 2d15bce7aa3c..831a4684df40 100644
--- a/include/linux/audit.h
+++ b/include/linux/audit.h
@@ -237,9 +237,14 @@ extern void audit_seccomp_actions_logged(const char *names,
                                          const char *old_names, int res);
 extern void __audit_ptrace(struct task_struct *t);
 
+static inline struct audit_context *audit_context(void)
+{
+        return current->audit_context;
+}
+
 static inline bool audit_dummy_context(void)
 {
-        void *p = current->audit_context;
+        void *p = audit_context();
         return !p || *(int *)p;
 }
 static inline void audit_free(struct task_struct *task)
@@ -251,12 +256,12 @@ static inline void audit_syscall_entry(int major, unsigned long a0,
                                        unsigned long a1, unsigned long a2,
                                        unsigned long a3)
 {
-        if (unlikely(current->audit_context))
+        if (unlikely(audit_context()))
                 __audit_syscall_entry(major, a0, a1, a2, a3);
 }
 static inline void audit_syscall_exit(void *pt_regs)
 {
-        if (unlikely(current->audit_context)) {
+        if (unlikely(audit_context())) {
                 int success = is_syscall_success(pt_regs);
                 long return_code = regs_return_value(pt_regs);
 
@@ -464,6 +469,10 @@ static inline bool audit_dummy_context(void)
 {
         return true;
 }
+static inline struct audit_context *audit_context(void)
+{
+        return NULL;
+}
 static inline struct filename *audit_reusename(const __user char *name)
 {
         return NULL;
diff --git a/include/net/xfrm.h b/include/net/xfrm.h
index fcce8eef6c70..7f2e31aa3d65 100644
--- a/include/net/xfrm.h
+++ b/include/net/xfrm.h
@@ -736,7 +736,7 @@ static inline struct audit_buffer *xfrm_audit_start(const char *op)
 
         if (audit_enabled == 0)
                 return NULL;
-        audit_buf = audit_log_start(current->audit_context, GFP_ATOMIC,
+        audit_buf = audit_log_start(audit_context(), GFP_ATOMIC,
                                     AUDIT_MAC_IPSEC_EVENT);
         if (audit_buf == NULL)
                 return NULL;
diff --git a/kernel/audit.c b/kernel/audit.c
index e9f9a90790e5..e7478cb58079 100644
--- a/kernel/audit.c
+++ b/kernel/audit.c
@@ -1099,8 +1099,7 @@ static void audit_log_feature_change(int which, u32 old_feature, u32 new_feature
 
         if (audit_enabled == AUDIT_OFF)
                 return;
-        ab = audit_log_start(current->audit_context,
-                             GFP_KERNEL, AUDIT_FEATURE_CHANGE);
+        ab = audit_log_start(audit_context(), GFP_KERNEL, AUDIT_FEATURE_CHANGE);
         if (!ab)
                 return;
         audit_log_task_info(ab, current);
@@ -2317,8 +2316,7 @@ void audit_log_link_denied(const char *operation)
                 return;
 
         /* Generate AUDIT_ANOM_LINK with subject, operation, outcome. */
-        ab = audit_log_start(current->audit_context, GFP_KERNEL,
-                             AUDIT_ANOM_LINK);
+        ab = audit_log_start(audit_context(), GFP_KERNEL, AUDIT_ANOM_LINK);
         if (!ab)
                 return;
         audit_log_format(ab, "op=%s", operation);
diff --git a/kernel/audit_watch.c b/kernel/audit_watch.c
index 9eb8b3511636..f1ba88994508 100644
--- a/kernel/audit_watch.c
+++ b/kernel/audit_watch.c
@@ -274,7 +274,7 @@ static void audit_update_watch(struct audit_parent *parent,
                 /* If the update involves invalidating rules, do the inode-based
                  * filtering now, so we don't omit records. */
                 if (invalidating && !audit_dummy_context())
-                        audit_filter_inodes(current, current->audit_context);
+                        audit_filter_inodes(current, audit_context());
 
                 /* updating ino will likely change which audit_hash_list we
                  * are on so we need a new watch for the new list */
diff --git a/kernel/auditsc.c b/kernel/auditsc.c
index 378c45b92775..fce4acba576d 100644
--- a/kernel/auditsc.c
+++ b/kernel/auditsc.c
@@ -1509,8 +1509,7 @@ void __audit_free(struct task_struct *tsk)
 void __audit_syscall_entry(int major, unsigned long a1, unsigned long a2,
                            unsigned long a3, unsigned long a4)
 {
-        struct task_struct *tsk = current;
-        struct audit_context *context = tsk->audit_context;
+        struct audit_context *context = audit_context();
         enum audit_state     state;
 
         if (!audit_enabled || !context)
@@ -1525,7 +1524,7 @@ void __audit_syscall_entry(int major, unsigned long a1, unsigned long a2,
         context->dummy = !audit_n_rules;
         if (!context->dummy && state == AUDIT_BUILD_CONTEXT) {
                 context->prio = 0;
-                if (auditd_test_task(tsk))
+                if (auditd_test_task(current))
                         return;
         }
 
@@ -1563,12 +1562,12 @@ void __audit_syscall_exit(int success, long return_code)
         else
                 success = AUDITSC_FAILURE;
 
-        context = audit_take_context(tsk, success, return_code);
+        context = audit_take_context(current, success, return_code);
         if (!context)
                 return;
 
         if (context->in_syscall && context->current_state == AUDIT_RECORD_CONTEXT)
-                audit_log_exit(context, tsk);
+                audit_log_exit(context, current);
 
         context->in_syscall = 0;
         context->prio = context->state == AUDIT_RECORD_CONTEXT ? ~0ULL : 0;
@@ -1602,7 +1601,7 @@ static inline void handle_one(const struct inode *inode)
         int count;
         if (likely(!inode->i_fsnotify_marks))
                 return;
-        context = current->audit_context;
+        context = audit_context();
         p = context->trees;
         count = context->tree_count;
         rcu_read_lock();
@@ -1633,7 +1632,7 @@ static void handle_path(const struct dentry *dentry)
         unsigned long seq;
         int count;
 
-        context = current->audit_context;
+        context = audit_context();
         p = context->trees;
         count = context->tree_count;
 retry:
@@ -1715,7 +1714,7 @@ static struct audit_names *audit_alloc_name(struct audit_context *context,
 struct filename *
 __audit_reusename(const __user char *uptr)
 {
-        struct audit_context *context = current->audit_context;
+        struct audit_context *context = audit_context();
         struct audit_names *n;
 
         list_for_each_entry(n, &context->names_list, list) {
@@ -1738,7 +1737,7 @@ __audit_reusename(const __user char *uptr)
  */
 void __audit_getname(struct filename *name)
 {
-        struct audit_context *context = current->audit_context;
+        struct audit_context *context = audit_context();
         struct audit_names *n;