1 files changed, 5 insertions, 4 deletions

diff --git a/security/integrity/integrity_audit.c b/security/integrity/integrity_audit.c
index d7efb30404aa..90987d15b6fe 100644
--- a/security/integrity/integrity_audit.c
+++ b/security/integrity/integrity_audit.c
@@ -7,7 +7,7 @@
  * the Free Software Foundation, version 2 of the License.
  *
  * File: integrity_audit.c
- *      Audit calls for the integrity subsystem
+ *      Audit calls for the integrity subsystem
  */
 
 #include <linux/fs.h>
@@ -22,7 +22,7 @@ static int __init integrity_audit_setup(char *str)
 {
         unsigned long audit;
 
-        if (!strict_strtoul(str, 0, &audit))
+        if (!kstrtoul(str, 0, &audit))
                 integrity_audit_info = audit ? 1 : 0;
         return 1;
 }
@@ -33,13 +33,14 @@ void integrity_audit_msg(int audit_msgno, struct inode *inode,
                          const char *cause, int result, int audit_info)
 {
         struct audit_buffer *ab;
+        char name[TASK_COMM_LEN];
 
         if (!integrity_audit_info && audit_info == 1)   /* Skip info messages */
                 return;
 
         ab = audit_log_start(current->audit_context, GFP_KERNEL, audit_msgno);
         audit_log_format(ab, "pid=%d uid=%u auid=%u ses=%u",
-                         current->pid,
+                         task_pid_nr(current),
                          from_kuid(&init_user_ns, current_cred()->uid),
                          from_kuid(&init_user_ns, audit_get_loginuid(current)),
                          audit_get_sessionid(current));
@@ -49,7 +50,7 @@ void integrity_audit_msg(int audit_msgno, struct inode *inode,
         audit_log_format(ab, " cause=");
         audit_log_string(ab, cause);
         audit_log_format(ab, " comm=");
-        audit_log_untrustedstring(ab, current->comm);
+        audit_log_untrustedstring(ab, get_task_comm(name, current));
         if (fname) {
                 audit_log_format(ab, " name=");
                 audit_log_untrustedstring(ab, fname);