Staging: exfat: avoid use of strcpy
PATCH v4 1/1 Staging: exfat: avoid use of strcpy
Replacing strcpy with strscpy and moving the length check to the same function.
---
Took a couple attempts to finaly get this right :P
v4: Replaced strlen check
v3: Failed to replace check
v2: Forgot to replace strlen check
v1: original patch
drivers/staging/exfat/exfat_core.c | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-)
drivers/staging/exfat/exfat_core.c +3 -6
@@ -2960,18 +2960,15 @@ s32 resolve_path(struct inode *inode, char *path, struct chain_t *p_dir,struct super_block *sb = inode->i_sb;struct fs_info_t *p_fs = &(EXFAT_SB (sb)->fs_info);struct file_id_t *fid = &(EXFAT_I (inode)->fid); - -if (strlen (path) >= (MAX_NAME_LENGTH *MAX_CHARSET_SIZE )) + +if (strscpy (name_buf, path,sizeof (name_buf)) <0 )return FFS_INVALIDPATH ; -strcpy (name_buf, path); -nls_cstring_to_uniname (sb, p_uniname, name_buf, &lossy);if (lossy)return FFS_INVALIDPATH ; - fid->size =i_size_read (inode); - +fid->size =i_size_read (inode); p_dir->dir = fid->start_clu; p_dir->size = (s32)(fid->size >> p_fs->cluster_size_bits); p_dir->flags = fid->flags;
Signature · 1 line
2.23.0
drivers/staging/exfat/exfat_core.c s32 resolve_path(struct inode *inode, char *path, struct chain_t *p_dir, · line 2963
Quoted 11 lines · Sandro Volery
drivers/staging/exfat/exfat_core.c +1
-2@@ -2960,18 +2960,15 @@ s32 resolve_path(struct inode *inode, char *path, struct chain_t *p_dir,struct super_block *sb = inode->i_sb;struct fs_info_t *p_fs = &(EXFAT_SB (sb)->fs_info);struct file_id_t *fid = &(EXFAT_I (inode)->fid); - -if (strlen (path) >= (MAX_NAME_LENGTH *MAX_CHARSET_SIZE )) +
You have added a tab here.
drivers/staging/exfat/exfat_core.c s32 resolve_path(struct inode *inode, char *path, struct chain_t *p_dir, · line 2971
Quoted 12 lines
drivers/staging/exfat/exfat_core.c +2
-4+if (strscpy (name_buf, path,sizeof (name_buf)) <0 )return FFS_INVALIDPATH ; -strcpy (name_buf, path); -nls_cstring_to_uniname (sb, p_uniname, name_buf, &lossy);if (lossy)return FFS_INVALIDPATH ; - fid->size =i_size_read (inode); - +fid->size =i_size_read (inode);
And you accidentally deleted some white space here.
I use vim, so I have it configured to highlight whitespace at the end of a line. I don't remember how it's done now but I googled it for you.
https://vim.fandom.com/wiki/Highlight_unwanted_spaces
regards,
dan carpenter
Quoted 34 lines · Dan Carpenter
drivers/staging/exfat/exfat_core.c s32 resolve_path(struct inode *inode, char *path, struct chain_t *p_dir, · line 2963
Quoted 11 lines · Sandro Volery
drivers/staging/exfat/exfat_core.c +1
-2@@ -2960,18 +2960,15 @@ s32 resolve_path(struct inode *inode, char *path, struct chain_t *p_dir,struct super_block *sb = inode->i_sb;struct fs_info_t *p_fs = &(EXFAT_SB (sb)->fs_info);struct file_id_t *fid = &(EXFAT_I (inode)->fid); - -if (strlen (path) >= (MAX_NAME_LENGTH *MAX_CHARSET_SIZE )) +You have added a tab here.
drivers/staging/exfat/exfat_core.c s32 resolve_path(struct inode *inode, char *path, struct chain_t *p_dir, · line 2971
Quoted 12 lines
drivers/staging/exfat/exfat_core.c +2
-4+if (strscpy (name_buf, path,sizeof (name_buf)) <0 )return FFS_INVALIDPATH ; -strcpy (name_buf, path); -nls_cstring_to_uniname (sb, p_uniname, name_buf, &lossy);if (lossy)return FFS_INVALIDPATH ; - fid->size =i_size_read (inode); - +fid->size =i_size_read (inode);And you accidentally deleted some white space here.
Quoted 3 lines
I use vim, so I have it configured to highlight whitespace at the end of a line. I don't remember how it's done now but I googled it for you.
https://vim.fandom.com/wiki/Highlight_unwanted_spaces
Ugh I'm so sorry I make the most stupid mistakes today.. I was so sure this time I got it right!
I'll fix it tomorrow.
Thanks,
Sandro V
No worries... We all have days like that occasionally. :P
regards,
dan carpenter