2022-08-18 21:12:31

by Wolfram Sang

Subject: [PATCH 04/14] ocfs2: move from strlcpy with unused retval to strscpy

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@mail.gmail.com/
Signed-off-by: Wolfram Sang <[email protected]>
---
fs/ocfs2/stackglue.c | 4 ++--
fs/ocfs2/super.c | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/fs/ocfs2/stackglue.c b/fs/ocfs2/stackglue.c
index dd77b7aaabf5..317126261523 100644
--- a/fs/ocfs2/stackglue.c
+++ b/fs/ocfs2/stackglue.c
@@ -334,10 +334,10 @@ int ocfs2_cluster_connect(const char *stack_name,
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;
diff --git a/fs/ocfs2/super.c b/fs/ocfs2/super.c
index 013a727bd7c8..ec46489b6c7e 100644
--- a/fs/ocfs2/super.c
+++ b/fs/ocfs2/super.c
@@ -2222,7 +2222,7 @@ static int ocfs2_initialize_super(struct super_block *sb,
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);
--
2.35.1

2022-08-21 13:43:49

by Joseph Qi

Subject: Re: [PATCH 04/14] ocfs2: move from strlcpy with unused retval to strscpy

On 8/19/22 5:01 AM, Wolfram Sang wrote:
> 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@mail.gmail.com/
> Signed-off-by: Wolfram Sang <[email protected]>

Acked-by: Joseph Qi <[email protected]>
> ---
> fs/ocfs2/stackglue.c | 4 ++--
> fs/ocfs2/super.c | 2 +-
> 2 files changed, 3 insertions(+), 3 deletions(-)
>
> diff --git a/fs/ocfs2/stackglue.c b/fs/ocfs2/stackglue.c
> index dd77b7aaabf5..317126261523 100644
> --- a/fs/ocfs2/stackglue.c
> +++ b/fs/ocfs2/stackglue.c
> @@ -334,10 +334,10 @@ int ocfs2_cluster_connect(const char *stack_name,
> 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;
> diff --git a/fs/ocfs2/super.c b/fs/ocfs2/super.c
> index 013a727bd7c8..ec46489b6c7e 100644
> --- a/fs/ocfs2/super.c
> +++ b/fs/ocfs2/super.c
> @@ -2222,7 +2222,7 @@ static int ocfs2_initialize_super(struct super_block *sb,
> 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);