Re: [PATCH v2] Staging: exfat: Avoid use of strcpy

From: Sandro Volery
Date: Wed Sep 11 2019 - 06:24:30 EST




> On 11 Sep 2019, at 12:06, Dan Carpenter <dan.carpenter@xxxxxxxxxx> wrote:
>
> ïOn Wed, Sep 11, 2019 at 11:42:19AM +0200, Sandro Volery wrote:
>> 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 <linux@xxxxxxxxxxxxxxxxxx>
>> Signed-off-by: Sandro Volery <sandro@xxxxxxxxxx>
>> ---
>> v2: Implement length check and return in one
>> v1: Original Patch
>> drivers/staging/exfat/exfat_core.c | 3 ++-
>> 1 file changed, 2 insertions(+), 1 deletion(-)
>>
>> diff --git a/drivers/staging/exfat/exfat_core.c b/drivers/staging/exfat/exfat_core.c
>> index da8c58149c35..4c40f1352848 100644
>> --- a/drivers/staging/exfat/exfat_core.c
>> +++ b/drivers/staging/exfat/exfat_core.c
>> @@ -2964,7 +2964,8 @@ s32 resolve_path(struct inode *inode, char *path, struct chain_t *p_dir,
>> if (strlen(path) >= (MAX_NAME_LENGTH * MAX_CHARSET_SIZE))
> ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
> Delete this as it is no longer required.
>

Yep, saw it from Rasmus response too just now.. Dumb mistake.
Will fix this this afternoon.

Sandro V

>> return FFS_INVALIDPATH;
>>
>> - strcpy(name_buf, path);
>> + if (strscpy(name_buf, path, sizeof(name_buf)) < 0)
>> + return FFS_INVALIDPATH;
>