From: Shreeya Patel <shreeya.patel@collabora.com> To: tytso@mit.edu, adilger.kernel@dilger.ca, jaegeuk@kernel.org, chao@kernel.org, krisman@collabora.com, ebiggers@google.com, drosen@google.com, ebiggers@kernel.org, yuchao0@huawei.com Cc: linux-ext4@vger.kernel.org, linux-kernel@vger.kernel.org, linux-f2fs-devel@lists.sourceforge.net, linux-fsdevel@vger.kernel.org, kernel@collabora.com, andre.almeida@collabora.com, kernel test robot <lkp@intel.com> Subject: [PATCH v8 1/4] fs: unicode: Use strscpy() instead of strncpy() Date: Sat, 24 Apr 2021 02:21:33 +0530 [thread overview] Message-ID: <20210423205136.1015456-2-shreeya.patel@collabora.com> (raw) In-Reply-To: <20210423205136.1015456-1-shreeya.patel@collabora.com> Following warning was reported by Kernel Test Robot. In function 'utf8_parse_version', inlined from 'utf8_load' at fs/unicode/utf8mod.c:195:7: >> fs/unicode/utf8mod.c:175:2: warning: 'strncpy' specified bound 12 equals destination size [-Wstringop-truncation] 175 | strncpy(version_string, version, sizeof(version_string)); | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ The -Wstringop-truncation warning highlights the unintended uses of the strncpy function that truncate the terminating NULL character if source string is longer than the destination size. strscpy() returns -E2BIG error code in case the source string doesn't fit into the destination. Hence, use strscpy() and return an error for overly-long strings instead of creating a non-null-terminated string with strncpy(). Fixes: 9d53690f0d4e5 (unicode: implement higher level API for string handling) Acked-by: Gabriel Krisman Bertazi <krisman@collabora.com> Signed-off-by: Shreeya Patel <shreeya.patel@collabora.com> Reported-by: kernel test robot <lkp@intel.com> --- Changes in v8 - Improve the commit message to decribe about how overly-long strings are handled. fs/unicode/utf8-core.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/fs/unicode/utf8-core.c b/fs/unicode/utf8-core.c index dc25823bfed9..f9e6a2718aba 100644 --- a/fs/unicode/utf8-core.c +++ b/fs/unicode/utf8-core.c @@ -179,8 +179,10 @@ static int utf8_parse_version(const char *version, unsigned int *maj, {1, "%d.%d.%d"}, {0, NULL} }; + int ret = strscpy(version_string, version, sizeof(version_string)); - strncpy(version_string, version, sizeof(version_string)); + if (ret < 0) + return ret; if (match_token(version_string, token, args) != 1) return -EINVAL; -- 2.30.2
WARNING: multiple messages have this Message-ID (diff)
From: Shreeya Patel <shreeya.patel@collabora.com> To: tytso@mit.edu, adilger.kernel@dilger.ca, jaegeuk@kernel.org, chao@kernel.org, krisman@collabora.com, ebiggers@google.com, drosen@google.com, ebiggers@kernel.org, yuchao0@huawei.com Cc: kernel@collabora.com, kernel test robot <lkp@intel.com>, linux-kernel@vger.kernel.org, linux-f2fs-devel@lists.sourceforge.net, linux-fsdevel@vger.kernel.org, andre.almeida@collabora.com, linux-ext4@vger.kernel.org Subject: [f2fs-dev] [PATCH v8 1/4] fs: unicode: Use strscpy() instead of strncpy() Date: Sat, 24 Apr 2021 02:21:33 +0530 [thread overview] Message-ID: <20210423205136.1015456-2-shreeya.patel@collabora.com> (raw) In-Reply-To: <20210423205136.1015456-1-shreeya.patel@collabora.com> Following warning was reported by Kernel Test Robot. In function 'utf8_parse_version', inlined from 'utf8_load' at fs/unicode/utf8mod.c:195:7: >> fs/unicode/utf8mod.c:175:2: warning: 'strncpy' specified bound 12 equals destination size [-Wstringop-truncation] 175 | strncpy(version_string, version, sizeof(version_string)); | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ The -Wstringop-truncation warning highlights the unintended uses of the strncpy function that truncate the terminating NULL character if source string is longer than the destination size. strscpy() returns -E2BIG error code in case the source string doesn't fit into the destination. Hence, use strscpy() and return an error for overly-long strings instead of creating a non-null-terminated string with strncpy(). Fixes: 9d53690f0d4e5 (unicode: implement higher level API for string handling) Acked-by: Gabriel Krisman Bertazi <krisman@collabora.com> Signed-off-by: Shreeya Patel <shreeya.patel@collabora.com> Reported-by: kernel test robot <lkp@intel.com> --- Changes in v8 - Improve the commit message to decribe about how overly-long strings are handled. fs/unicode/utf8-core.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/fs/unicode/utf8-core.c b/fs/unicode/utf8-core.c index dc25823bfed9..f9e6a2718aba 100644 --- a/fs/unicode/utf8-core.c +++ b/fs/unicode/utf8-core.c @@ -179,8 +179,10 @@ static int utf8_parse_version(const char *version, unsigned int *maj, {1, "%d.%d.%d"}, {0, NULL} }; + int ret = strscpy(version_string, version, sizeof(version_string)); - strncpy(version_string, version, sizeof(version_string)); + if (ret < 0) + return ret; if (match_token(version_string, token, args) != 1) return -EINVAL; -- 2.30.2 _______________________________________________ Linux-f2fs-devel mailing list Linux-f2fs-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/linux-f2fs-devel
next prev parent reply other threads:[~2021-04-23 20:52 UTC|newest] Thread overview: 30+ messages / expand[flat|nested] mbox.gz Atom feed top 2021-04-23 20:51 [PATCH v8 0/4] Make UTF-8 encoding loadable Shreeya Patel 2021-04-23 20:51 ` [f2fs-dev] " Shreeya Patel 2021-04-23 20:51 ` Shreeya Patel [this message] 2021-04-23 20:51 ` [f2fs-dev] [PATCH v8 1/4] fs: unicode: Use strscpy() instead of strncpy() Shreeya Patel 2021-04-23 20:51 ` [PATCH v8 2/4] fs: unicode: Rename function names from utf8 to unicode Shreeya Patel 2021-04-23 20:51 ` [f2fs-dev] " Shreeya Patel 2021-04-23 20:51 ` [PATCH v8 3/4] fs: unicode: Rename utf8-core file to unicode-core Shreeya Patel 2021-04-23 20:51 ` [f2fs-dev] " Shreeya Patel 2021-04-23 20:51 ` [PATCH v8 4/4] fs: unicode: Add utf8 module and a unicode layer Shreeya Patel 2021-04-23 20:51 ` [f2fs-dev] " Shreeya Patel 2021-04-27 6:29 ` Christoph Hellwig 2021-04-27 6:29 ` [f2fs-dev] " Christoph Hellwig 2021-04-27 10:09 ` Shreeya Patel 2021-04-27 10:09 ` [f2fs-dev] " Shreeya Patel 2021-04-27 14:50 ` Theodore Ts'o 2021-04-27 14:50 ` [f2fs-dev] " Theodore Ts'o 2021-04-27 15:06 ` Gabriel Krisman Bertazi 2021-04-27 15:06 ` [f2fs-dev] " Gabriel Krisman Bertazi 2021-04-28 14:12 ` Theodore Ts'o 2021-04-28 14:12 ` [f2fs-dev] " Theodore Ts'o 2021-04-28 18:58 ` Gabriel Krisman Bertazi 2021-04-28 18:58 ` [f2fs-dev] " Gabriel Krisman Bertazi [not found] ` <7caab939-2800-0cc2-7b65-345af3fce73d@collabora.com> 2021-05-11 4:35 ` Christoph Hellwig 2021-05-11 4:35 ` [f2fs-dev] " Christoph Hellwig 2021-05-20 20:19 ` Shreeya Patel 2021-05-20 20:19 ` [f2fs-dev] " Shreeya Patel 2021-06-03 0:07 ` Gabriel Krisman Bertazi 2021-06-03 0:07 ` [f2fs-dev] " Gabriel Krisman Bertazi 2021-06-16 4:09 ` Christoph Hellwig 2021-06-16 4:09 ` [f2fs-dev] " Christoph Hellwig
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=20210423205136.1015456-2-shreeya.patel@collabora.com \ --to=shreeya.patel@collabora.com \ --cc=adilger.kernel@dilger.ca \ --cc=andre.almeida@collabora.com \ --cc=chao@kernel.org \ --cc=drosen@google.com \ --cc=ebiggers@google.com \ --cc=ebiggers@kernel.org \ --cc=jaegeuk@kernel.org \ --cc=kernel@collabora.com \ --cc=krisman@collabora.com \ --cc=linux-ext4@vger.kernel.org \ --cc=linux-f2fs-devel@lists.sourceforge.net \ --cc=linux-fsdevel@vger.kernel.org \ --cc=linux-kernel@vger.kernel.org \ --cc=lkp@intel.com \ --cc=tytso@mit.edu \ --cc=yuchao0@huawei.com \ /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: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.