[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-ID: <065b2dea-0c0a-4961-ac18-2ddd62f0b808@kernel.org>
Date: Mon, 18 Nov 2024 09:23:57 +0800
From: Chao Yu <chao@...nel.org>
To: Daniel Yang <danielyangkang@...il.com>, Jaegeuk Kim <jaegeuk@...nel.org>,
"open list:F2FS FILE SYSTEM" <linux-f2fs-devel@...ts.sourceforge.net>,
open list <linux-kernel@...r.kernel.org>
Cc: Chao Yu <chao@...nel.org>
Subject: Re: [PATCH v2] f2fs: replace deprecated strcpy with strscpy
On 2024/11/9 9:38, Daniel Yang wrote:
> strcpy is deprecated. Kernel docs recommend replacing strcpy with
> strscpy. The function strcpy() return value isn't used so there
> shouldn't be an issue replacing with the safer alternative strscpy.
>
> Signed-off-by: Daniel Yang <danielyangkang@...il.com>
> ---
> V1 -> V2: handle strscpy errors, changed prefix to f2fs
>
> fs/f2fs/super.c | 11 +++++++++--
> 1 file changed, 9 insertions(+), 2 deletions(-)
>
> diff --git a/fs/f2fs/super.c b/fs/f2fs/super.c
> index 87ab5696b..4721a8a8f 100644
> --- a/fs/f2fs/super.c
> +++ b/fs/f2fs/super.c
> @@ -5,6 +5,7 @@
> * Copyright (c) 2012 Samsung Electronics Co., Ltd.
> * http://www.samsung.com/
> */
> #include <linux/module.h>
> #include <linux/init.h>
> #include <linux/fs.h>
> @@ -1158,7 +1159,10 @@ static int parse_options(struct super_block *sb, char *options, bool is_remount)
> break;
> }
>
> - strcpy(ext[ext_cnt], name);
> + if (strscpy(ext[ext_cnt], name) == -E2BIG) {
> + kfree(name);
> + return -EINVAL;
How about?
ret = strscpy(ext[ext_cnt], name);
if (ret < 0) {
kfree(name);
return ret;
}
> + }
> F2FS_OPTION(sbi).compress_ext_cnt++;
> kfree(name);
> break;
> @@ -1187,7 +1191,10 @@ static int parse_options(struct super_block *sb, char *options, bool is_remount)
> break;
> }
>
> - strcpy(noext[noext_cnt], name);
> + if (strscpy(noext[noext_cnt], name) == -E2BIG) {
> + kfree(name);
> + return -EINVAL;
> + }
Ditto
Thanks,
> F2FS_OPTION(sbi).nocompress_ext_cnt++;
> kfree(name);
> break;
Powered by blists - more mailing lists