Skip to contentSkip to conversation

fs-ocfs2-replace-strlcpy-with-sysfs_emit.patch removed from -mm tree

merged mm-nonmm-stable Andrew Morton 1 participant 1 message Oct 4, 2023

lore
Share & tools
lore

Andrew Morton

author tree notice Applied
#0 lore raw

The quilt patch titled
Subject: fs: ocfs2: replace strlcpy with sysfs_emit
has been removed from the -mm tree. Its filename was
fs-ocfs2-replace-strlcpy-with-sysfs_emit.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: fs: ocfs2: replace strlcpy with sysfs_emit
Date: Thu, 31 Aug 2023 19:38:27 +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 sysfs_emit().

Direct replacement is safe here since its ok for kernel_param_ops.get() to return -errno [3].

[1] https://www.kernel.org/doc/html/latest/process/deprecated.html#strlcpy
[2] https://github.com/KSPP/linux/issues/89
[3] https://elixir.bootlin.com/linux/v6.5/source/include/linux/moduleparam.h#L52

---

 fs/ocfs2/dlmfs/dlmfs.c |    3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)
fs/ocfs2/dlmfs/dlmfs.c renamed from fs/ocfs2/dlmfs/dlmfs.c~fs-ocfs2-replace-strlcpy-with-sysfs_emit +1 -2
@@ -80,8 +80,7 @@ static int param_set_dlmfs_capabilities(
 static int param_get_dlmfs_capabilities(char *buffer,
 					const struct kernel_param *kp)
 {
-	return strlcpy(buffer, DLMFS_CAPABILITIES,
-		       strlen(DLMFS_CAPABILITIES) + 1);
+	return sysfs_emit(buffer, DLMFS_CAPABILITIES);
 }
 module_param_call(capabilities, param_set_dlmfs_capabilities,
 		  param_get_dlmfs_capabilities, NULL, 0444);

_

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