2 files changed, 10 insertions, 1 deletions

diff --git a/kernel/audit.c b/kernel/audit.c
index f207289d686b..25e4ed016793 100644
--- a/kernel/audit.c
+++ b/kernel/audit.c
@@ -1859,7 +1859,8 @@ void audit_log_task_info(struct audit_buffer *ab, struct task_struct *tsk)
                 if (mm->exe_file)
                         audit_log_d_path(ab, " exe=", &mm->exe_file->f_path);
                 up_read(&mm->mmap_sem);
-        }
+        } else
+                audit_log_format(ab, " exe=(null)");
         audit_log_task_context(ab);
 }
 EXPORT_SYMBOL(audit_log_task_info);
diff --git a/kernel/auditsc.c b/kernel/auditsc.c
index fc3b3dbcc8aa..05634b3ba244 100644
--- a/kernel/auditsc.c
+++ b/kernel/auditsc.c
@@ -2353,6 +2353,7 @@ static void audit_log_task(struct audit_buffer *ab)
         kuid_t auid, uid;
         kgid_t gid;
         unsigned int sessionid;
+        struct mm_struct *mm = current->mm;
 
         auid = audit_get_loginuid(current);
         sessionid = audit_get_sessionid(current);
@@ -2366,6 +2367,13 @@ static void audit_log_task(struct audit_buffer *ab)
         audit_log_task_context(ab);
         audit_log_format(ab, " pid=%d comm=", current->pid);
         audit_log_untrustedstring(ab, current->comm);
+        if (mm) {
+                down_read(&mm->mmap_sem);
+                if (mm->exe_file)
+                        audit_log_d_path(ab, " exe=", &mm->exe_file->f_path);
+                up_read(&mm->mmap_sem);
+        } else
+                audit_log_format(ab, " exe=(null)");
 }
 
 /**