From: Kees Cook <keescook@chromium.org>
To: Azeem Shaikh <azeemshaikh38@gmail.com>
Cc: linux-hardening@vger.kernel.org, linux-kernel@vger.kernel.org,
"Masahiro Yamada" <masahiroy@kernel.org>,
"Thomas Weißschuh" <linux@weissschuh.net>
Subject: Re: [PATCH] init/version.c: Replace strlcpy with strscpy
Date: Wed, 30 Aug 2023 14:17:12 -0700 [thread overview]
Message-ID: <202308301415.42CAF1C13B@keescook> (raw)
In-Reply-To: <20230830160806.3821893-1-azeemshaikh38@gmail.com>
On Wed, Aug 30, 2023 at 04:08:06PM +0000, Azeem Shaikh wrote:
> strlcpy() reads the entire source buffer first.
> This read may exceed the destination size limit.
> This is both inefficient and can lead to linear read
> overflows if a source string is not NUL-terminated [1].
> In an effort to remove strlcpy() completely [2], replace
> strlcpy() here with strscpy().
>
> Direct replacement is safe here since return value of -errno
> is used to check for truncation instead of sizeof(dest).
>
> [1] https://www.kernel.org/doc/html/latest/process/deprecated.html#strlcpy
> [2] https://github.com/KSPP/linux/issues/89
>
> Signed-off-by: Azeem Shaikh <azeemshaikh38@gmail.com>
> ---
> init/version.c | 6 +++---
> 1 file changed, 3 insertions(+), 3 deletions(-)
>
> diff --git a/init/version.c b/init/version.c
> index f117921811b4..94c96f6fbfe6 100644
> --- a/init/version.c
> +++ b/init/version.c
> @@ -21,10 +21,10 @@ static int __init early_hostname(char *arg)
> {
> size_t bufsize = sizeof(init_uts_ns.name.nodename);
> size_t maxlen = bufsize - 1;
> - size_t arglen;
> + ssize_t arglen;
>
> - arglen = strlcpy(init_uts_ns.name.nodename, arg, bufsize);
> - if (arglen > maxlen) {
> + arglen = strscpy(init_uts_ns.name.nodename, arg, bufsize);
> + if (arglen < 0) {
nitpick: this is no longer "length of arg", it's the length of the
destination string. Regardless:
Reviewed-by: Kees Cook <keescook@chromium.org>
> pr_warn("hostname parameter exceeds %zd characters and will be truncated",
> maxlen);
> }
> --
> 2.41.0.255.g8b1d071c50-goog
>
>
--
Kees Cook
next prev parent reply other threads:[~2023-08-30 21:18 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-08-30 16:08 [PATCH] init/version.c: Replace strlcpy with strscpy Azeem Shaikh
2023-08-30 20:08 ` Justin Stitt
2023-08-30 21:17 ` Kees Cook [this message]
2023-09-15 5:31 ` Kees Cook
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=202308301415.42CAF1C13B@keescook \
--to=keescook@chromium.org \
--cc=azeemshaikh38@gmail.com \
--cc=linux-hardening@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux@weissschuh.net \
--cc=masahiroy@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;
as well as URLs for NNTP newsgroup(s).