Skip to contentSkip to conversation

acct-replace-all-non-returning-strlcpy-with-strscpy.patch removed from -mm tree

merged mm-nonmm-stable Andrew Morton 1 participant 1 message Aug 12, 2023

lore
Share & tools
lore

Andrew Morton

author tree notice Applied
#0 lore raw

The quilt patch titled
Subject: acct: replace all non-returning strlcpy with strscpy
has been removed from the -mm tree. Its filename was
acct-replace-all-non-returning-strlcpy-with-strscpy.patch

This patch was dropped because it was merged into the mm-nonmm-stable branch of git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm

------------------------------------------------------
From: Azeem Shaikh <[email protected]>
Subject: acct: replace all non-returning strlcpy with strscpy
Date: Mon, 10 Jul 2023 01:17:48 +0000

strlcpy() reads the entire source buffer first. This read may exceed the destination size limit. This is both inefficient and can lead to linear read overflows if a source string is not NUL-terminated [1]. In an effort to remove strlcpy() completely [2], replace strlcpy() here with strscpy(). No return values were used, so direct replacement is safe.

[1] https://www.kernel.org/doc/html/latest/process/deprecated.html#strlcpy
[2] https://github.com/KSPP/linux/issues/89

---

 kernel/acct.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
kernel/acct.c renamed from kernel/acct.c~acct-replace-all-non-returning-strlcpy-with-strscpy +1 -1
@@ -445,7 +445,7 @@ static void fill_ac(acct_t *ac)
 	memset(ac, 0, sizeof(acct_t));
 
 	ac->ac_version = ACCT_VERSION | ACCT_BYTEORDER;
-	strlcpy(ac->ac_comm, current->comm, sizeof(ac->ac_comm));
+	strscpy(ac->ac_comm, current->comm, sizeof(ac->ac_comm));
 
 	/* calculate run_time in nsec*/
 	run_time = ktime_get_ns();

_

Patches currently in -mm which might be from [email protected] are