From: Richard Guy Briggs <rgb@redhat.com>
Date: Wed, 15 Apr 2015 18:08:25 +0000 (-0400)
Subject: lsm: rename duplicate labels in LSM_AUDIT_DATA_TASK audit message type
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=5c5bc97e2fc819112ece40e7d433039d6df8f7ba;p=linux-beck.git

lsm: rename duplicate labels in LSM_AUDIT_DATA_TASK audit message type

The LSM_AUDIT_DATA_TASK pid= and comm= labels are duplicates of those at the
start of this function with different values.  Rename them to their object
counterparts opid= and ocomm= to disambiguate.

Signed-off-by: Richard Guy Briggs <rgb@redhat.com>
[PM: minor merging needed due to differences in the tree]
Signed-off-by: Paul Moore <pmoore@redhat.com>
---

diff --git a/security/lsm_audit.c b/security/lsm_audit.c
index 69fdf3bc765b..07fc99724d41 100644
--- a/security/lsm_audit.c
+++ b/security/lsm_audit.c
@@ -281,7 +281,7 @@ static void dump_common_audit_data(struct audit_buffer *ab,
 		if (tsk) {
 			pid_t pid = task_pid_nr(tsk);
 			if (pid) {
-				audit_log_format(ab, " pid=%d comm=", pid);
+				audit_log_format(ab, " opid=%d ocomm=", pid);
 				audit_log_untrustedstring(ab, tsk->comm);
 			}
 		}