From: Kees Cook <keescook@chromium.org>
To: Bagas Sanjaya <bagasdotme@gmail.com>
Cc: Geert Uytterhoeven <geert@linux-m68k.org>,
Wolfram Sang <wsa+renesas@sang-engineering.com>,
Nick Desaulniers <ndesaulniers@google.com>,
Guenter Roeck <linux@roeck-us.net>,
Linus Torvalds <torvalds@linux-foundation.org>,
Jonathan Corbet <corbet@lwn.net>, Len Baker <len.baker@gmx.com>,
"Gustavo A. R. Silva" <gustavoars@kernel.org>,
Francis Laniel <laniel_francis@privacyrequired.com>,
Paolo Abeni <pabeni@redhat.com>,
linux-kernel@vger.kernel.org, linux-doc@vger.kernel.org,
linux-hardening@vger.kernel.org
Subject: Re: [PATCH v2] string: Introduce strtomem() and strtomem_pad()
Date: Fri, 2 Sep 2022 14:01:55 -0700 [thread overview]
Message-ID: <202209021401.674DEF1936@keescook> (raw)
In-Reply-To: <YxGEwdc69waEXhnV@debian.me>
On Fri, Sep 02, 2022 at 11:21:21AM +0700, Bagas Sanjaya wrote:
> On Thu, Sep 01, 2022 at 12:09:52PM -0700, Kees Cook wrote:
> > + * Do not use this function. While FORTIFY_SOURCE tries to avoid
> > + * over-reads of @q, it cannot defend against writing unterminated
> > + * results to @p. Using strncpy() remains ambiguous and fragile.
> > + * Instead, please choose an alternative, so that the expectation
> > + * of @p's contents is unambiguous:
> > + *
> > + * @p needs to be: | padded to @size | not padded
> > + * --------------------+-----------------+------------+
> > + * NUL-terminated | strscpy_pad() | strscpy() |
> > + * --------------------+-----------------+------------+
> > + * not NUL-terminated | strtomem_pad() | strtomem() |
> > + * --------------------+-----------------+------------+
> > + *
>
> My htmldocs build doesn't catch any new warnings, but I think the table
> above can be fixed up:
>
> ---- >8 ----
>
> diff --git a/include/linux/fortify-string.h b/include/linux/fortify-string.h
> index eed2119b23c523..3413a8e561fc62 100644
> --- a/include/linux/fortify-string.h
> +++ b/include/linux/fortify-string.h
> @@ -95,12 +95,13 @@ extern char *__underlying_strncpy(char *p, const char *q, __kernel_size_t size)
> * Instead, please choose an alternative, so that the expectation
> * of @p's contents is unambiguous:
> *
> - * @p needs to be: | padded to @size | not padded
> - * --------------------+-----------------+------------+
> - * NUL-terminated | strscpy_pad() | strscpy() |
> - * --------------------+-----------------+------------+
> - * not NUL-terminated | strtomem_pad() | strtomem() |
> - * --------------------+-----------------+------------+
> + * +--------------------+-----------------+------------+
> + * |@p needs to be: | padded to @size | not padded |
> + * +====================+=================+============+
> + * | NUL-terminated | strscpy_pad() | strscpy() |
> + * +--------------------+-----------------+------------+
> + * | not NUL-terminated | strtomem_pad() | strtomem() |
> + * +--------------------+-----------------+------------+
Ah thank you!
> Regardless, I don't see these new table above in the output (am I missing
> something?).
Oh, yes, you're right. I will add an kern-doc directive to pull in the
file.
--
Kees Cook
prev parent reply other threads:[~2022-09-02 21:02 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-09-01 19:09 [PATCH v2] string: Introduce strtomem() and strtomem_pad() Kees Cook
2022-09-01 19:34 ` Guenter Roeck
2022-09-02 20:52 ` Kees Cook
2022-09-02 21:47 ` Guenter Roeck
2022-09-02 22:37 ` Kees Cook
2022-09-02 1:53 ` Bagas Sanjaya
2022-09-02 20:56 ` Kees Cook
2022-09-02 4:21 ` Bagas Sanjaya
2022-09-02 21:01 ` Kees Cook [this message]
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=202209021401.674DEF1936@keescook \
--to=keescook@chromium.org \
--cc=bagasdotme@gmail.com \
--cc=corbet@lwn.net \
--cc=geert@linux-m68k.org \
--cc=gustavoars@kernel.org \
--cc=laniel_francis@privacyrequired.com \
--cc=len.baker@gmx.com \
--cc=linux-doc@vger.kernel.org \
--cc=linux-hardening@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux@roeck-us.net \
--cc=ndesaulniers@google.com \
--cc=pabeni@redhat.com \
--cc=torvalds@linux-foundation.org \
--cc=wsa+renesas@sang-engineering.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: 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).