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 69fdf3bc765b3e1deddb374dfa27908fc05df851..07fc99724d4135c280d78b887008aba7550f3d38 100644 (file)
--- 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);
                        }
                }