summaryrefslogtreecommitdiffstats
path: root/security
diff options
context:
space:
mode:
authorRichard Guy Briggs <rgb@redhat.com>2015-04-15 14:08:25 -0400
committerPaul Moore <pmoore@redhat.com>2015-05-29 15:09:54 -0400
commit5c5bc97e2fc819112ece40e7d433039d6df8f7ba (patch)
tree93dc892a21a96b74459724946a724105d640e445 /security
parent39a8804455fb23f09157341d3ba7db6d7ae6ee76 (diff)
downloadlinux-5c5bc97e2fc819112ece40e7d433039d6df8f7ba.tar.gz
linux-5c5bc97e2fc819112ece40e7d433039d6df8f7ba.tar.bz2
linux-5c5bc97e2fc819112ece40e7d433039d6df8f7ba.zip
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>
Diffstat (limited to 'security')
-rw-r--r--security/lsm_audit.c2
1 files changed, 1 insertions, 1 deletions
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);
}
}