From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sat, 27 Jun 2015 20:53:16 +0000 (-0700)
Subject: Merge branch 'upstream' of git://git.infradead.org/users/pcmoore/audit
X-Git-Tag: v4.2-rc1~76
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=4a10a91756ef381bced7b88cfb9232f660b92d93;p=karo-tx-linux.git

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
---

4a10a91756ef381bced7b88cfb9232f660b92d93
diff --cc security/lsm_audit.c
index 1d34277dc402,07fc99724d41..4ed98107ace3
--- a/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) {
 +				char comm[sizeof(tsk->comm)];
- 				audit_log_format(ab, " pid=%d comm=", pid);
+ 				audit_log_format(ab, " opid=%d ocomm=", pid);
 -				audit_log_untrustedstring(ab, tsk->comm);
 +				audit_log_untrustedstring(ab,
 +				    memcpy(comm, tsk->comm, sizeof(comm)));
  			}
  		}
  		break;