OrgACRN
/
acrn-kernel
mirror of https://github.com/projectacrn/acrn-kernel.git
1
0
Fork 0
Code Issues Releases Wiki Activity

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/
Link: https://lkml.kernel.org/r/20220818210123.7637-4-wsa+renesas@sang-engineering.com
Signed-off-by: Wolfram Sang <wsa+renesas@sang-engineering.com>
Acked-by: Joseph Qi <joseph.qi@linux.alibaba.com>
Cc: Mark Fasheh <mark@fasheh.com>
Cc: Joel Becker <jlbec@evilplan.org>
Cc: Junxiao Bi <junxiao.bi@oracle.com>
Cc: Changwei Ge <gechangwei@live.cn>
Cc: Gang He <ghe@suse.com>
Cc: Jun Piao <piaojun@huawei.com>

Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
This commit is contained in:
Wolfram Sang 2022-08-18 23:01:13 +02:00 committed by Andrew Morton
parent 216e71f13c
commit c97e21fe91
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
fs/ocfs2/stackglue.c
View File

@ -334,10 +334,10 @@ int ocfs2_cluster_connect(const char *stack_name,
goto out; 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; new_conn->cc_namelen = grouplen;
if (cluster_name_len) if (cluster_name_len)
strlcpy(new_conn->cc_cluster_name, cluster_name, strscpy(new_conn->cc_cluster_name, cluster_name,
CLUSTER_NAME_MAX + 1); CLUSTER_NAME_MAX + 1);
new_conn->cc_cluster_name_len = cluster_name_len; new_conn->cc_cluster_name_len = cluster_name_len;
new_conn->cc_recovery_handler = recovery_handler; new_conn->cc_recovery_handler = recovery_handler;

2
fs/ocfs2/super.c
View File

@ -2221,7 +2221,7 @@ static int ocfs2_initialize_super(struct super_block *sb,
goto out_journal; 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); OCFS2_MAX_VOL_LABEL_LEN);
osb->root_blkno = le64_to_cpu(di->id2.i_super.s_root_blkno); 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); osb->system_dir_blkno = le64_to_cpu(di->id2.i_super.s_system_dir_blkno);