From: Kees Cook <kees@kernel.org>
Date: Thu, 11 Jul 2024 17:13:09 +0000 (-0700)
Subject: tsacct: replace strncpy() with strscpy()
X-Git-Tag: v6.11-rc1~84^2~2
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=0fe2356434e157b3952ff4dbdfe0a96070ddcaa2;p=thirdparty%2Fkernel%2Flinux.git

tsacct: replace strncpy() with strscpy()

Replace the deprecated[1] use of strncpy() in bacct_add_tsk().  Since this
is UAPI, include trailing padding in the copy.

Link: https://github.com/KSPP/linux/issues/90 [1]
Link: https://lkml.kernel.org/r/20240711171308.work.995-kees@kernel.org
Signed-off-by: Kees Cook <kees@kernel.org>
Cc: "Dr. Thomas Orgis" <thomas.orgis@uni-hamburg.de>
Cc: Eric W. Biederman <ebiederm@xmission.com>
Cc: Ismael Luceno <ismael@iodev.co.uk>
Cc: Peng Liu <liupeng256@huawei.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
---

diff --git a/kernel/tsacct.c b/kernel/tsacct.c
index 4252f0645b9e3..16b283f9d8314 100644
--- a/kernel/tsacct.c
+++ b/kernel/tsacct.c
@@ -76,7 +76,7 @@ void bacct_add_tsk(struct user_namespace *user_ns,
 	stats->ac_minflt = tsk->min_flt;
 	stats->ac_majflt = tsk->maj_flt;
 
-	strncpy(stats->ac_comm, tsk->comm, sizeof(stats->ac_comm));
+	strscpy_pad(stats->ac_comm, tsk->comm);
 }