2019-09-12 08:29:19

by Sandro Volery

Subject: [PATCH v5] Staging: exfat: Avoid use of strcpy

Use strscpy instead of strcpy in exfat_core.c, and add a check
for length that will return already known FFS_INVALIDPATH.

Suggested-by: Rasmus Villemoes <[email protected]>
Signed-off-by: Sandro Volery <[email protected]>
---
v5: Fixed some whitespaces
v4: Replaced strlen check
v3: Failed to replace check
v2: Forgot to replace strlen check
v1: original patch
drivers/staging/exfat/exfat_core.c | 4 +---
1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/drivers/staging/exfat/exfat_core.c b/drivers/staging/exfat/exfat_core.c
index da8c58149c35..ee474ae3bd98 100644
--- a/drivers/staging/exfat/exfat_core.c
+++ b/drivers/staging/exfat/exfat_core.c
@@ -2961,11 +2961,9 @@ s32 resolve_path(struct inode *inode, char *path, struct chain_t *p_dir,
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;
--
2.23.0

2019-09-12 08:36:36

by Dan Carpenter

Subject: Re: [PATCH v5] Staging: exfat: Avoid use of strcpy

You did it. Well done. :P

Reviewed-by: Dan Carpenter <[email protected]>

regards,
dan carpenter

2019-09-12 16:28:15

by Sandro Volery

Subject: Re: [PATCH v5] Staging: exfat: Avoid use of strcpy

> On 12 Sep 2019, at 10:34, Dan Carpenter <[email protected]> wrote:
>
> You did it. Well done. :P
>
> Reviewed-by: Dan Carpenter <[email protected]>

Thanks :D Had some issues with my git configuration
setting up a home workstation but now it is all fine