From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S965241AbbDOSJO (ORCPT ); Wed, 15 Apr 2015 14:09:14 -0400 Received: from mx1.redhat.com ([209.132.183.28]:56724 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756339AbbDOSJI (ORCPT ); Wed, 15 Apr 2015 14:09:08 -0400 From: Richard Guy Briggs To: linux-security-module@vger.kernel.org, linux-kernel@vger.kernel.org, linux-audit@redhat.com Cc: Richard Guy Briggs , sgrubb@redhat.com, eparis@parisplace.org, pmoore@redhat.com, jmorris@namei.org Subject: [PATCH] lsm: rename duplicate labels in LSM_AUDIT_DATA_TASK audit message type Date: Wed, 15 Apr 2015 14:08:25 -0400 Message-Id: <096df9441c4492ab31851eba63fee4408872d06f.1429121009.git.rgb@redhat.com> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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 --- security/lsm_audit.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/security/lsm_audit.c b/security/lsm_audit.c index b526ddc..3323144 100644 --- a/security/lsm_audit.c +++ b/security/lsm_audit.c @@ -282,7 +282,7 @@ static void dump_common_audit_data(struct audit_buffer *ab, 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, memcpy(comm, tsk->comm, sizeof(comm))); } -- 1.7.1