From: Christian Göttsche <cgzones@googlemail.com>
Date: Mon, 25 Nov 2024 10:59:23 +0000 (+0100)
Subject: lsm: rename variable to avoid shadowing
X-Git-Tag: block-6.14-20240131~32^2~3
X-Git-Url: https://git.kernel.dk/?a=commitdiff_plain;h=b00083aed484a2885bc92c6a7a85d7952c101d75;p=linux-block.git

lsm: rename variable to avoid shadowing

The function dump_common_audit_data() contains two variables with the
name comm: one declared at the top and one nested one.  Rename the
nested variable to improve readability and make future refactorings
of the function less error prone.

Signed-off-by: Christian Göttsche <cgzones@googlemail.com>
[PM: description long line removal, line wrap cleanup, merge fuzz]
Signed-off-by: Paul Moore <paul@paul-moore.com>
---

diff --git a/security/lsm_audit.c b/security/lsm_audit.c
index 8df6f77a7526..54a7b62ca030 100644
--- a/security/lsm_audit.c
+++ b/security/lsm_audit.c
@@ -299,10 +299,10 @@ static void dump_common_audit_data(struct audit_buffer *ab,
 		if (tsk) {
 			pid_t pid = task_tgid_nr(tsk);
 			if (pid) {
-				char comm[sizeof(tsk->comm)];
+				char tskcomm[sizeof(tsk->comm)];
 				audit_log_format(ab, " opid=%d ocomm=", pid);
 				audit_log_untrustedstring(ab,
-				    get_task_comm(comm, tsk));
+				    get_task_comm(tskcomm, tsk));
 			}
 		}
 		break;