From: hpa@zytor.com
To: Daniel Kiper <daniel.kiper@oracle.com>,
grub-devel@gnu.org, linux-kernel@vger.kernel.org, x86@kernel.org
Cc: bp@alien8.de, eric.snowberg@oracle.com,
kanth.ghatraju@oracle.com, konrad.wilk@oracle.com,
mingo@redhat.com, phcoder@gmail.com, rdunlap@infradead.org,
ross.philipson@oracle.com, krystian.hebel@3mdeb.com,
maciej.pijanowski@3mdeb.com, michal.zygowski@3mdeb.com,
piotr.krol@3mdeb.com
Subject: Re: [GRUB PATCH 1/1] loader/i386/linux: Fix an underflow in the setup_header length calculation
Date: Sun, 08 Dec 2019 14:47:22 -0800 [thread overview]
Message-ID: <C4B79E8A-F6FB-4FAC-B621-6F70AB4EDBE0@zytor.com> (raw)
In-Reply-To: <20191208224357.ex5uxseu45og7s37@tomti.i.net-space.pl>
On December 8, 2019 2:43:57 PM PST, Daniel Kiper <daniel.kiper@oracle.com> wrote:
>Hmmm... Nobody cares? Strange...
>
>Adding 3mdeb folks...
>
>Daniel
>
>On Mon, Dec 02, 2019 at 06:29:39PM +0100, Daniel Kiper wrote:
>> Recent work around x86 Linux kernel loader revealed an underflow in
>the
>> setup_header length calculation and another related issue. Both lead
>to
>> the memory overwrite and later machine crash.
>>
>> Currently when the GRUB copies the setup_header into the linux_params
>> (struct boot_params, traditionally known as "zero page") it assumes
>the
>> setup_header size as sizeof(linux_i386_kernel_header/lh). This is
>> incorrect. It should use the value calculated accordingly to the
>Linux
>> kernel boot protocol. Otherwise in case of pretty old kernel, to be
>> exact Linux kernel boot protocol, the GRUB may write more into
>> linux_params than it was expected to. Fortunately this is not very
>big
>> issue. Though it has to be fixed. However, there is also an underflow
>> which is grave. It happens when
>>
>> sizeof(linux_i386_kernel_header/lh) > "real size of the
>setup_header".
>>
>> Then len value wraps around and grub_file_read() reads whole kernel
>into
>> the linux_params overwriting memory past it. This leads to the GRUB
>> memory allocator breakage and finally to its crash during boot.
>>
>> The patch fixes both issues. Additionally, it moves the code not
>related to
>>
>grub_memset(linux_params)/grub_memcpy(linux_params)/grub_file_read(linux_params)
>> section outside of it to not confuse the reader.
>>
>> Signed-off-by: Daniel Kiper <daniel.kiper@oracle.com>
>> ---
>> grub-core/loader/i386/linux.c | 15 ++++++++-------
>> 1 file changed, 8 insertions(+), 7 deletions(-)
>>
>> diff --git a/grub-core/loader/i386/linux.c
>b/grub-core/loader/i386/linux.c
>> index d0501e229..ee95cd374 100644
>> --- a/grub-core/loader/i386/linux.c
>> +++ b/grub-core/loader/i386/linux.c
>> @@ -761,17 +761,12 @@ grub_cmd_linux (grub_command_t cmd
>__attribute__ ((unused)),
>> goto fail;
>>
>> grub_memset (&linux_params, 0, sizeof (linux_params));
>> - grub_memcpy (&linux_params.setup_sects, &lh.setup_sects, sizeof
>(lh) - 0x1F1);
>> -
>> - linux_params.code32_start = prot_mode_target + lh.code32_start -
>GRUB_LINUX_BZIMAGE_ADDR;
>> - linux_params.kernel_alignment = (1 << align);
>> - linux_params.ps_mouse = linux_params.padding10 = 0;
>>
>> /*
>> * The Linux 32-bit boot protocol defines the setup header end
>> * to be at 0x202 + the byte value at 0x201.
>> */
>> - len = 0x202 + *((char *) &linux_params.jump + 1);
>> + len = 0x202 + *((char *) &lh.jump + 1);
>>
>> /* Verify the struct is big enough so we do not write past the
>end. */
>> if (len > (char *) &linux_params.edd_mbr_sig_buffer - (char *)
>&linux_params) {
>> @@ -779,10 +774,13 @@ grub_cmd_linux (grub_command_t cmd
>__attribute__ ((unused)),
>> goto fail;
>> }
>>
>> + grub_memcpy (&linux_params.setup_sects, &lh.setup_sects, len -
>0x1F1);
>> +
>> /* We've already read lh so there is no need to read it second
>time. */
>> len -= sizeof(lh);
>>
>> - if (grub_file_read (file, (char *) &linux_params + sizeof (lh),
>len) != len)
>> + if ((len > 0) &&
>> + (grub_file_read (file, (char *) &linux_params + sizeof (lh),
>len) != len))
>> {
>> if (!grub_errno)
>> grub_error (GRUB_ERR_BAD_OS, N_("premature end of file %s"),
>> @@ -790,6 +788,9 @@ grub_cmd_linux (grub_command_t cmd __attribute__
>((unused)),
>> goto fail;
>> }
>>
>> + linux_params.code32_start = prot_mode_target + lh.code32_start -
>GRUB_LINUX_BZIMAGE_ADDR;
>> + linux_params.kernel_alignment = (1 << align);
>> + linux_params.ps_mouse = linux_params.padding10 = 0;
>> linux_params.type_of_loader = GRUB_LINUX_BOOT_LOADER_TYPE;
>>
>> /* These two are used (instead of cmd_line_ptr) by older versions
>of Linux,
>> --
>> 2.11.0
Please fix these problems. It is a huge headache for us in the kennel community.
--
Sent from my Android device with K-9 Mail. Please excuse my brevity.
next prev parent reply other threads:[~2019-12-08 22:48 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-12-02 17:29 Daniel Kiper
2019-12-08 22:43 ` Daniel Kiper
2019-12-08 22:47 ` hpa [this message]
2019-12-13 12:57 ` Javier Martinez Canillas
2019-12-13 18:43 ` Ross Philipson
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=C4B79E8A-F6FB-4FAC-B621-6F70AB4EDBE0@zytor.com \
--to=hpa@zytor.com \
--cc=bp@alien8.de \
--cc=daniel.kiper@oracle.com \
--cc=eric.snowberg@oracle.com \
--cc=grub-devel@gnu.org \
--cc=kanth.ghatraju@oracle.com \
--cc=konrad.wilk@oracle.com \
--cc=krystian.hebel@3mdeb.com \
--cc=linux-kernel@vger.kernel.org \
--cc=maciej.pijanowski@3mdeb.com \
--cc=michal.zygowski@3mdeb.com \
--cc=mingo@redhat.com \
--cc=phcoder@gmail.com \
--cc=piotr.krol@3mdeb.com \
--cc=rdunlap@infradead.org \
--cc=ross.philipson@oracle.com \
--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
all inboxes | Powered by JetHome®