The patch titled
Subject: ocfs2: move from strlcpy with unused retval to strscpy
has been added to the -mm mm-nonmm-unstable branch. Its filename is
ocfs2-move-from-strlcpy-with-unused-retval-to-strscpy.patch
This patch will shortly appear at
https://git.kernel.org/pub/scm/linux/kernel/git/akpm/25-new.git/tree/patches/ocfs2-move-from-strlcpy-with-unused-retval-to-strscpy.patch
This patch will later appear in the mm-nonmm-unstable branch at
git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm
Before you just go and hit "reply", please:
a) Consider who else should be cc'ed
b) Prefer to cc a suitable mailing list as well
c) Ideally: find the original patch on the mailing list and do a
reply-to-all to that, adding suitable additional cc's
*** Remember to use Documentation/process/submit-checklist.rst when testing your code ***
The -mm tree is included into linux-next via the mm-everything
branch at git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm
and is updated there every 2-3 working days
------------------------------------------------------
From: Wolfram Sang <wsa+renesas@xxxxxxxxxxxxxxxxxxxx>
Subject: ocfs2: move from strlcpy with unused retval to strscpy
Date: Thu, 18 Aug 2022 23:01:13 +0200
Follow the advice of the below link and prefer 'strscpy' in this
subsystem. Conversion is 1:1 because the return value is not used.
Generated by a coccinelle script.
Link: https://lore.kernel.org/r/CAHk-=wgfRnXz0W3D37d01q3JFkr_i_uTL=V6A6G1oUZcprmknw@xxxxxxxxxxxxxx/
Link: https://lkml.kernel.org/r/20220818210123.7637-4-wsa+renesas@xxxxxxxxxxxxxxxxxxxx
Signed-off-by: Wolfram Sang <wsa+renesas@xxxxxxxxxxxxxxxxxxxx>
Acked-by: Joseph Qi <joseph.qi@xxxxxxxxxxxxxxxxx>
Cc: Mark Fasheh <mark@xxxxxxxxxx>
Cc: Joel Becker <jlbec@xxxxxxxxxxxx>
Cc: Junxiao Bi <junxiao.bi@xxxxxxxxxx>
Cc: Changwei Ge <gechangwei@xxxxxxx>
Cc: Gang He <ghe@xxxxxxxx>
Cc: Jun Piao <piaojun@xxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
fs/ocfs2/stackglue.c | 4 ++--
fs/ocfs2/super.c | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
--- a/fs/ocfs2/stackglue.c~ocfs2-move-from-strlcpy-with-unused-retval-to-strscpy
+++ a/fs/ocfs2/stackglue.c
@@ -334,10 +334,10 @@ int ocfs2_cluster_connect(const char *st
goto out;
}
- strlcpy(new_conn->cc_name, group, GROUP_NAME_MAX + 1);
+ strscpy(new_conn->cc_name, group, GROUP_NAME_MAX + 1);
new_conn->cc_namelen = grouplen;
if (cluster_name_len)
- strlcpy(new_conn->cc_cluster_name, cluster_name,
+ strscpy(new_conn->cc_cluster_name, cluster_name,
CLUSTER_NAME_MAX + 1);
new_conn->cc_cluster_name_len = cluster_name_len;
new_conn->cc_recovery_handler = recovery_handler;
--- a/fs/ocfs2/super.c~ocfs2-move-from-strlcpy-with-unused-retval-to-strscpy
+++ a/fs/ocfs2/super.c
@@ -2221,7 +2221,7 @@ static int ocfs2_initialize_super(struct
goto out_journal;
}
- strlcpy(osb->vol_label, di->id2.i_super.s_label,
+ strscpy(osb->vol_label, di->id2.i_super.s_label,
OCFS2_MAX_VOL_LABEL_LEN);
osb->root_blkno = le64_to_cpu(di->id2.i_super.s_root_blkno);
osb->system_dir_blkno = le64_to_cpu(di->id2.i_super.s_system_dir_blkno);
_
Patches currently in -mm which might be from wsa+renesas@xxxxxxxxxxxxxxxxxxxx are
alpha-move-from-strlcpy-with-unused-retval-to-strscpy.patch
ia64-move-from-strlcpy-with-unused-retval-to-strscpy.patch
ocfs2-move-from-strlcpy-with-unused-retval-to-strscpy.patch
