Merge branch 'upstream' of git://git.infradead.org/users/pcmoore/audit

Pull audit updates from Paul Moore:
 "Four small audit patches for v4.2, all bug fixes.  Only 10 lines of
  change this time so very unremarkable, the patch subject lines pretty
  much tell the whole story"

* 'upstream' of git://git.infradead.org/users/pcmoore/audit:
  audit: Fix check of return value of strnlen_user()
  audit: obsolete audit_context check is removed in audit_filter_rules()
  audit: fix for typo in comment to function audit_log_link_denied()
  lsm: rename duplicate labels in LSM_AUDIT_DATA_TASK audit message type

diff --cc kernel/audit.c
Simple merge

diff --cc kernel/auditsc.c
Simple merge

diff --cc security/lsm_audit.c
index 1d34277dc402b5971122fdb35d0171eb33f612f5,07fc99724d4135c280d78b887008aba7550f3d38..4ed98107ace31c3bfef3dc87f6c58e0e91a581cf
--- 1/security/lsm_audit.c
--- 2/security/lsm_audit.c
+++ b/security/lsm_audit.c
@@@ -281,10 -281,8 +281,10 @@@ static void dump_common_audit_data(stru
                if (tsk) {
                        pid_t pid = task_pid_nr(tsk);
                        if (pid) {
-                               audit_log_format(ab, " pid=%d comm=", pid);
 +                              char comm[sizeof(tsk->comm)];
 -                              audit_log_untrustedstring(ab, tsk->comm);
+                               audit_log_format(ab, " opid=%d ocomm=", pid);
 +                              audit_log_untrustedstring(ab,
 +                                  memcpy(comm, tsk->comm, sizeof(comm)));
                        }
                }
                break;