1 files changed, 4 insertions, 2 deletions

diff --git a/kernel/auditsc.c b/kernel/auditsc.c
index 40722e26de98..298897559ca4 100644
--- a/kernel/auditsc.c
+++ b/kernel/auditsc.c
@@ -781,8 +781,8 @@ static void audit_log_task_info(struct audit_buffer *ab, struct task_struct *tsk
                         if ((vma->vm_flags & VM_EXECUTABLE) &&
                             vma->vm_file) {
                                 audit_log_d_path(ab, "exe=",
-                                                 vma->vm_file->f_dentry,
-                                                 vma->vm_file->f_vfsmnt);
+                                                 vma->vm_file->f_path.dentry,
+                                                 vma->vm_file->f_path.mnt);
                                 break;
                         }
                         vma = vma->vm_next;
@@ -826,10 +826,12 @@ static void audit_log_exit(struct audit_context *context, struct task_struct *ts
                                  context->return_code);
 
         mutex_lock(&tty_mutex);
+        read_lock(&tasklist_lock);
         if (tsk->signal && tsk->signal->tty && tsk->signal->tty->name)
                 tty = tsk->signal->tty->name;
         else
                 tty = "(none)";
+        read_unlock(&tasklist_lock);
         audit_log_format(ab,
                   " a0=%lx a1=%lx a2=%lx a3=%lx items=%d"
                   " ppid=%d pid=%d auid=%u uid=%u gid=%u"