From: Chao Yu <chao@kernel.org>
To: Daniel Yang <danielyangkang@gmail.com>,
Jaegeuk Kim <jaegeuk@kernel.org>,
"open list:F2FS FILE SYSTEM"
<linux-f2fs-devel@lists.sourceforge.net>,
open list <linux-kernel@vger.kernel.org>
Cc: Chao Yu <chao@kernel.org>
Subject: Re: [PATCH v2] f2fs: replace deprecated strcpy with strscpy
Date: Mon, 18 Nov 2024 09:23:57 +0800 [thread overview]
Message-ID: <065b2dea-0c0a-4961-ac18-2ddd62f0b808@kernel.org> (raw)
In-Reply-To: <20241109013819.5952-1-danielyangkang@gmail.com>
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@gmail.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;
next prev parent reply other threads:[~2024-11-18 1:24 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-11-09 1:38 Daniel Yang
2024-11-18 1:23 ` Chao Yu [this message]
2024-11-18 7:03 ` Daniel Yang
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=065b2dea-0c0a-4961-ac18-2ddd62f0b808@kernel.org \
--to=chao@kernel.org \
--cc=danielyangkang@gmail.com \
--cc=jaegeuk@kernel.org \
--cc=linux-f2fs-devel@lists.sourceforge.net \
--cc=linux-kernel@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®