From: Arvind Sankar <nivedita@alum.mit.edu>
To: Randy Dunlap <rdunlap@infradead.org>
Cc: Arvind Sankar <nivedita@alum.mit.edu>,
x86@kernel.org, kasan-dev@googlegroups.com,
Kees Cook <keescook@chromium.org>,
linux-kernel@vger.kernel.org
Subject: Re: [RFC PATCH 2/2] x86/cmdline: Use strscpy to initialize boot_command_line
Date: Sat, 5 Sep 2020 19:16:44 -0400 [thread overview]
Message-ID: <20200905231644.GA1506363@rani.riverdale.lan> (raw)
In-Reply-To: <f5a29e70-7d11-16ec-8d72-ed71da4124c1@infradead.org>
On Sat, Sep 05, 2020 at 03:59:04PM -0700, Randy Dunlap wrote:
> On 9/5/20 3:23 PM, Arvind Sankar wrote:
> > The x86 boot protocol requires the kernel command line to be a
> > NUL-terminated string of length at most COMMAND_LINE_SIZE (including the
> > terminating NUL). In case the bootloader messed up and the command line
> > is too long (hence not NUL-terminated), use strscpy to copy the command
> > line into boot_command_line. This ensures that boot_command_line is
> > NUL-terminated, and it also avoids accessing beyond the actual end of
> > the command line if it was properly NUL-terminated.
> >
> > Note that setup_arch() will already force command_line to be
> > NUL-terminated by using strlcpy(), as well as boot_command_line if a
> > builtin command line is configured. If boot_command_line was not
> > initially NUL-terminated, the strlen() inside of strlcpy()/strlcat()
> > will run beyond boot_command_line, but this is almost certainly
> > harmless in practice.
> >
> > Signed-off-by: Arvind Sankar <nivedita@alum.mit.edu>
>
> Hi,
> Just for my enlightenment, what would be wrong with:
>
> (which is done in arch/m68/kernel/setup_no.c)
>
> > ---
> > arch/x86/kernel/head64.c | 2 +-
> > arch/x86/kernel/head_32.S | 11 +++++------
> > 2 files changed, 6 insertions(+), 7 deletions(-)
> >
> > diff --git a/arch/x86/kernel/head64.c b/arch/x86/kernel/head64.c
> > index cbb71c1b574f..740dd05b9462 100644
> > --- a/arch/x86/kernel/head64.c
> > +++ b/arch/x86/kernel/head64.c
> > @@ -410,7 +410,7 @@ static void __init copy_bootdata(char *real_mode_data)
> > cmd_line_ptr = get_cmd_line_ptr();
> > if (cmd_line_ptr) {
> > command_line = __va(cmd_line_ptr);
> > memcpy(boot_command_line, command_line, COMMAND_LINE_SIZE);
> > + boot_command_line[COMMAND_LINE_SIZE - 1] = 0;
> > }
> >
> > /*
>
>
> thanks.
> --
> ~Randy
>
That still accesses beyond the end of the bootloader's command line,
which could theoretically be a bad thing: eg the EFI stub only allocates
enough space for the actual length of the command line, rather than the
full COMMAND_LINE_SIZE. But yeah, that was my first version of this
patch.
> > NUL-terminated, and it also avoids accessing beyond the actual end of
> > the command line if it was properly NUL-terminated.
prev parent reply other threads:[~2020-09-05 23:16 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-09-05 22:23 [RFC PATCH 0/2] Allow use of lib/string in early boot Arvind Sankar
2020-09-05 22:23 ` [RFC PATCH 1/2] lib/string: Disable instrumentation Arvind Sankar
2020-09-08 9:39 ` Marco Elver
2020-09-08 17:21 ` Kees Cook
2020-09-08 18:40 ` Arvind Sankar
2020-09-09 5:20 ` Dmitry Vyukov
2020-09-05 22:23 ` [RFC PATCH 2/2] x86/cmdline: Use strscpy to initialize boot_command_line Arvind Sankar
2020-09-05 22:59 ` Randy Dunlap
2020-09-05 23:16 ` Arvind Sankar [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=20200905231644.GA1506363@rani.riverdale.lan \
--to=nivedita@alum.mit.edu \
--cc=kasan-dev@googlegroups.com \
--cc=keescook@chromium.org \
--cc=linux-kernel@vger.kernel.org \
--cc=rdunlap@infradead.org \
--cc=x86@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).