Commit b1385478 authored by Guenter Roeck's avatar Guenter Roeck Committed by Jaegeuk Kim

f2fs: Replace strncpy with memcpy

gcc 8.1.0 complains:

fs/f2fs/namei.c: In function 'f2fs_update_extension_list':
fs/f2fs/namei.c:257:3: warning:
	'strncpy' output truncated before terminating nul copying
	as many bytes from a string as its length
fs/f2fs/namei.c:249:3: warning:
	'strncpy' output truncated before terminating nul copying
	as many bytes from a string as its length

Using strncpy() is indeed less than perfect since the length of data to
be copied has already been determined with strlen(). Replace strncpy()
with memcpy() to address the warning and optimize the code a little.
Signed-off-by: default avatarGuenter Roeck <linux@roeck-us.net>
Reviewed-by: default avatarChao Yu <yuchao0@huawei.com>
Signed-off-by: default avatarJaegeuk Kim <jaegeuk@kernel.org>
parent 2d3a5856
...@@ -246,7 +246,7 @@ int f2fs_update_extension_list(struct f2fs_sb_info *sbi, const char *name, ...@@ -246,7 +246,7 @@ int f2fs_update_extension_list(struct f2fs_sb_info *sbi, const char *name,
return -EINVAL; return -EINVAL;
if (hot) { if (hot) {
strncpy(extlist[count], name, strlen(name)); memcpy(extlist[count], name, strlen(name));
sbi->raw_super->hot_ext_count = hot_count + 1; sbi->raw_super->hot_ext_count = hot_count + 1;
} else { } else {
char buf[F2FS_MAX_EXTENSION][F2FS_EXTENSION_LEN]; char buf[F2FS_MAX_EXTENSION][F2FS_EXTENSION_LEN];
...@@ -254,7 +254,7 @@ int f2fs_update_extension_list(struct f2fs_sb_info *sbi, const char *name, ...@@ -254,7 +254,7 @@ int f2fs_update_extension_list(struct f2fs_sb_info *sbi, const char *name,
memcpy(buf, &extlist[cold_count], memcpy(buf, &extlist[cold_count],
F2FS_EXTENSION_LEN * hot_count); F2FS_EXTENSION_LEN * hot_count);
memset(extlist[cold_count], 0, F2FS_EXTENSION_LEN); memset(extlist[cold_count], 0, F2FS_EXTENSION_LEN);
strncpy(extlist[cold_count], name, strlen(name)); memcpy(extlist[cold_count], name, strlen(name));
memcpy(&extlist[cold_count + 1], buf, memcpy(&extlist[cold_count + 1], buf,
F2FS_EXTENSION_LEN * hot_count); F2FS_EXTENSION_LEN * hot_count);
sbi->raw_super->extension_count = cpu_to_le32(cold_count + 1); sbi->raw_super->extension_count = cpu_to_le32(cold_count + 1);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment