boot/grub2: Backport Boothole securify fixes
PATCH v2 1/1 boot/grub2: Backport Boothole securify fixes
From: Stefan S?rensen <[email protected]>
Details: https://lists.gnu.org/archive/html/grub-devel/2020-07/msg00034.html
Fixes the following security issues:
* CVE-2020-10713
A flaw was found in grub2, prior to version 2.06. An attacker may use the GRUB 2 flaw to hijack and tamper the GRUB verification process. This flaw also allows the bypass of Secure Boot protections. In order to load an untrusted or modified kernel, an attacker would first need to establish access to the system such as gaining physical access, obtain the ability to alter a pxe-boot network, or have remote access to a networked system with root access. With this access, an attacker could then craft a string to cause a buffer overflow by injecting a malicious payload that leads to arbitrary code execution within GRUB. The highest threat from this vulnerability is to data confidentiality and integrity as well as system availability.
* CVE-2020-14308
In grub2 versions before 2.06 the grub memory allocator doesn't check for possible arithmetic overflows on the requested allocation size. This leads the function to return invalid memory allocations which can be further used to cause possible integrity, confidentiality and availability impacts during the boot process.
* CVE-2020-14309
There's an issue with grub2 in all versions before 2.06 when handling squashfs filesystems containing a symbolic link with name length of UINT32 bytes in size. The name size leads to an arithmetic overflow leading to a zero-size allocation further causing a heap-based buffer overflow with attacker controlled data.
* CVE-2020-14310
An integer overflow in read_section_from_string may lead to a heap based buffer overflow.
* CVE-2020-14311
An integer overflow in grub_ext2_read_link may lead to a heap-based buffer overflow.
* CVE-2020-15706
GRUB2 contains a race condition in grub_script_function_create() leading to a use-after-free vulnerability which can be triggered by redefining a function whilst the same function is already executing, leading to arbitrary code execution and secure boot restriction bypass
* CVE-2020-15707
Integer overflows were discovered in the functions grub_cmd_initrd and grub_initrd_init in the efilinux component of GRUB2, as shipped in Debian, Red Hat, and Ubuntu (the functionality is not included in GRUB2 upstream), leading to a heap-based buffer overflow. These could be triggered by an extremely large number of arguments to the initrd command on 32-bit architectures, or a crafted filesystem with very large files on any architecture. An attacker could use this to execute arbitrary code and bypass UEFI Secure Boot restrictions. This issue affects GRUB2 version 2.04 and prior versions.
---
Changes since v1:
* Add Signed-off-by to patches
...lexer-fatal-errors-actually-be-fatal.patch | 73 + ...e-arithmetic-primitives-that-check-f.patch | 128 ++ ...-we-always-have-an-overflow-checking.patch | 246 +++ ...005-calloc-Use-calloc-at-most-places.patch | 1840 +++++++++++++++++ ...low-checking-primitives-where-we-do-.patch | 1326 ++++++++++++ ...on-t-leak-memory-on-realloc-failures.patch | 72 + ...-not-load-more-than-one-NAME-section.patch | 41 + ...fxmenu-Fix-double-free-in-load_image.patch | 39 + ...ree-in-grub_xnu_devprop_add_property.patch | 58 + ...sure-we-don-t-dereference-past-array.patch | 55 + ...012-term-Fix-overflow-on-user-inputs.patch | 69 + boot/grub2/0013-udf-Fix-memory-leak.patch | 59 + ...emory-leak-if-grub_create_loader_cmd.patch | 38 + .../0015-tftp-Do-not-use-priority-queue.patch | 283 +++ ...t-grub_relocator_alloc_chunk_addr-in.patch | 153 ++ ...t-grub_relocator_alloc_chunk_align-m.patch | 341 +++ ...used-fields-from-grub_script_functio.patch | 37 + ...se-after-free-when-redefining-a-func.patch | 113 + ...ub_relocator_alloc_chunk_align-top-m.patch | 49 + .../0021-hfsplus-Fix-two-more-overflows.patch | 61 + ...-potential-data-dependent-alloc-over.patch | 116 ++ .../0023-emu-Make-grub_free-NULL-safe.patch | 38 + ...formed-device-path-arithmetic-errors.patch | 239 +++ ...Propagate-errors-from-copy_file_path.patch | 78 + ...x-use-after-free-in-halt-reboot-path.patch | 183 ++ ...id-overflow-on-initrd-size-calculati.patch | 32 + ...er-overflows-in-initrd-size-handling.patch | 173 ++ boot/grub2/grub2.mk | 11 + 28 files changed, 5951 insertions(+) create mode 100644 boot/grub2/0002-yylex-Make-lexer-fatal-errors-actually-be-fatal.patch create mode 100644 boot/grub2/0003-safemath-Add-some-arithmetic-primitives-that-check-f.patch create mode 100644 boot/grub2/0004-calloc-Make-sure-we-always-have-an-overflow-checking.patch create mode 100644 boot/grub2/0005-calloc-Use-calloc-at-most-places.patch create mode 100644 boot/grub2/0006-malloc-Use-overflow-checking-primitives-where-we-do-.patch create mode 100644 boot/grub2/0007-iso9660-Don-t-leak-memory-on-realloc-failures.patch create mode 100644 boot/grub2/0008-font-Do-not-load-more-than-one-NAME-section.patch create mode 100644 boot/grub2/0009-gfxmenu-Fix-double-free-in-load_image.patch create mode 100644 boot/grub2/0010-xnu-Fix-double-free-in-grub_xnu_devprop_add_property.patch create mode 100644 boot/grub2/0011-lzma-Make-sure-we-don-t-dereference-past-array.patch create mode 100644 boot/grub2/0012-term-Fix-overflow-on-user-inputs.patch create mode 100644 boot/grub2/0013-udf-Fix-memory-leak.patch create mode 100644 boot/grub2/0014-multiboot2-Fix-memory-leak-if-grub_create_loader_cmd.patch create mode 100644 boot/grub2/0015-tftp-Do-not-use-priority-queue.patch create mode 100644 boot/grub2/0016-relocator-Protect-grub_relocator_alloc_chunk_addr-in.patch create mode 100644 boot/grub2/0017-relocator-Protect-grub_relocator_alloc_chunk_align-m.patch create mode 100644 boot/grub2/0018-script-Remove-unused-fields-from-grub_script_functio.patch create mode 100644 boot/grub2/0019-script-Avoid-a-use-after-free-when-redefining-a-func.patch create mode 100644 boot/grub2/0020-relocator-Fix-grub_relocator_alloc_chunk_align-top-m.patch create mode 100644 boot/grub2/0021-hfsplus-Fix-two-more-overflows.patch create mode 100644 boot/grub2/0022-lvm-Fix-two-more-potential-data-dependent-alloc-over.patch create mode 100644 boot/grub2/0023-emu-Make-grub_free-NULL-safe.patch create mode 100644 boot/grub2/0024-efi-Fix-some-malformed-device-path-arithmetic-errors.patch create mode 100644 boot/grub2/0025-efi-chainloader-Propagate-errors-from-copy_file_path.patch create mode 100644 boot/grub2/0026-efi-Fix-use-after-free-in-halt-reboot-path.patch create mode 100644 boot/grub2/0027-loader-linux-Avoid-overflow-on-initrd-size-calculati.patch create mode 100644 boot/grub2/0028-linux-Fix-integer-overflows-in-initrd-size-handling.patch
boot/grub2/0002-yylex-Make-lexer-fatal-errors-actually-be-fatal.patch new file +73 -0
@@ -0,0 +1,73 @@ +From a7ab0cc98fa89a3d5098c29cbe44bcd24b0a6454 Mon Sep 17 00:00:00 2001 +From: Peter Jones <[email protected]> +Date: Wed, 15 Apr 2020 15:45:02 -0400 +Subject: [PATCH 02/28] yylex: Make lexer fatal errors actually be fatal +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +When presented with a command that can't be tokenized to anything +smaller than YYLMAX characters, the parser calls YY_FATAL_ERROR(errmsg), +expecting that will stop further processing, as such: + + #define YY_DO_BEFORE_ACTION \ + yyg->yytext_ptr = yy_bp; \ + yyleng = (int) (yy_cp - yy_bp); \ + yyg->yy_hold_char = *yy_cp; \ + *yy_cp = '\0'; \ + if ( yyleng >= YYLMAX ) \ + YY_FATAL_ERROR( "token too large, exceeds YYLMAX" ); \ + yy_flex_strncpy( yytext, yyg->yytext_ptr, yyleng + 1 , yyscanner); \ + yyg->yy_c_buf_p = yy_cp; + +The code flex generates expects that YY_FATAL_ERROR() will either return +for it or do some form of longjmp(), or handle the error in some way at +least, and so the strncpy() call isn't in an "else" clause, and thus if +YY_FATAL_ERROR() is *not* actually fatal, it does the call with the +questionable limit, and predictable results ensue. + +Unfortunately, our implementation of YY_FATAL_ERROR() is: + + #define YY_FATAL_ERROR(msg) \ + do { \ + grub_printf (_("fatal error: %s\n"), _(msg)); \ + } while (0) + +The same pattern exists in yyless(), and similar problems exist in users +of YY_INPUT(), several places in the main parsing loop, +yy_get_next_buffer(), yy_load_buffer_state(), yyensure_buffer_stack, +yy_scan_buffer(), etc. + +All of these callers expect YY_FATAL_ERROR() to actually be fatal, and +the things they do if it returns after calling it are wildly unsafe. + +Fixes: CVE-2020-10713 + +Signed-off-by: Peter Jones <[email protected]> +Reviewed-by: Daniel Kiper <[email protected]> +Signed-off-by: Stefan S?rensen <[email protected]> +--- + grub-core/script/yylex.l | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/grub-core/script/yylex.l b/grub-core/script/yylex.l +index 7b44c37b7..b7203c823 100644 +--- a/grub-core/script/yylex.l ++++ b/grub-core/script/yylex.l +@@ -37,11 +37,11 @@ + + /* + * As we don't have access to yyscanner, we cannot do much except to +- * print the fatal error. ++ * print the fatal error and exit. + */ + #define YY_FATAL_ERROR(msg) \ + do { \ +- grub_printf (_("fatal error: %s\n"), _(msg)); \ ++ grub_fatal (_("fatal error: %s\n"), _(msg));\ + } while (0) + + #define COPY(str, hint) \ +-- +2.26.2 +
boot/grub2/0003-safemath-Add-some-arithmetic-primitives-that-check-f.patch new file +128 -0
128 lines not on this page · raw message
boot/grub2/0004-calloc-Make-sure-we-always-have-an-overflow-checking.patch new file +246 -0
246 lines not on this page · raw message
boot/grub2/0005-calloc-Use-calloc-at-most-places.patch new file +1840 -0
1,840 lines not on this page · raw message
boot/grub2/0006-malloc-Use-overflow-checking-primitives-where-we-do-.patch new file +1326 -0
713 lines not on this page · raw message
boot/grub2/0007-iso9660-Don-t-leak-memory-on-realloc-failures.patch new file +72 -0
72 lines not on this page · raw message
boot/grub2/0008-font-Do-not-load-more-than-one-NAME-section.patch new file +41 -0
41 lines not on this page · raw message
boot/grub2/0009-gfxmenu-Fix-double-free-in-load_image.patch new file +39 -0
Lines of this file are not shown. View the raw message.
boot/grub2/0010-xnu-Fix-double-free-in-grub_xnu_devprop_add_property.patch new file +58 -0
58 lines not on this page · raw message
boot/grub2/0011-lzma-Make-sure-we-don-t-dereference-past-array.patch new file +55 -0
55 lines not on this page · raw message
boot/grub2/0012-term-Fix-overflow-on-user-inputs.patch new file +69 -0
69 lines not on this page · raw message
boot/grub2/0013-udf-Fix-memory-leak.patch new file +59 -0
59 lines not on this page · raw message
boot/grub2/0014-multiboot2-Fix-memory-leak-if-grub_create_loader_cmd.patch new file +38 -0
Lines of this file are not shown. View the raw message.
boot/grub2/0015-tftp-Do-not-use-priority-queue.patch new file +283 -0
283 lines not on this page · raw message
boot/grub2/0016-relocator-Protect-grub_relocator_alloc_chunk_addr-in.patch new file +153 -0
153 lines not on this page · raw message
boot/grub2/0017-relocator-Protect-grub_relocator_alloc_chunk_align-m.patch new file +341 -0
341 lines not on this page · raw message
boot/grub2/0018-script-Remove-unused-fields-from-grub_script_functio.patch new file +37 -0
Lines of this file are not shown. View the raw message.
boot/grub2/0019-script-Avoid-a-use-after-free-when-redefining-a-func.patch new file +113 -0
113 lines not on this page · raw message
boot/grub2/0020-relocator-Fix-grub_relocator_alloc_chunk_align-top-m.patch new file +49 -0
49 lines not on this page · raw message
boot/grub2/0021-hfsplus-Fix-two-more-overflows.patch new file +61 -0
61 lines not on this page · raw message
boot/grub2/0022-lvm-Fix-two-more-potential-data-dependent-alloc-over.patch new file +116 -0
116 lines not on this page · raw message
boot/grub2/0023-emu-Make-grub_free-NULL-safe.patch new file +38 -0
Lines of this file are not shown. View the raw message.
boot/grub2/0024-efi-Fix-some-malformed-device-path-arithmetic-errors.patch new file +239 -0
239 lines not on this page · raw message
boot/grub2/0025-efi-chainloader-Propagate-errors-from-copy_file_path.patch new file +78 -0
78 lines not on this page · raw message
boot/grub2/0026-efi-Fix-use-after-free-in-halt-reboot-path.patch new file +183 -0
183 lines not on this page · raw message
boot/grub2/0027-loader-linux-Avoid-overflow-on-initrd-size-calculati.patch new file +32 -0
Lines of this file are not shown. View the raw message.
boot/grub2/0028-linux-Fix-integer-overflows-in-initrd-size-handling.patch new file +173 -0
173 lines not on this page · raw message
The rest of this diff is not shown. View the raw message.
Signature · 1 line
2.26.2
Part of the diff is not shown here. View the raw message.
PATCH v2 1/1 boot/grub2: Backport Boothole securify fixes
Quoted 62 lines
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
"stefan" == stefan <[email protected]> writes:
From: Stefan S?rensen <[email protected]>
Details: https://lists.gnu.org/archive/html/grub-devel/2020-07/msg00034.htmlFixes the following security issues:
* CVE-2020-10713
A flaw was found in grub2, prior to version 2.06. An attacker may use the GRUB 2 flaw to hijack and tamper the GRUB verification process. This flaw also allows the bypass of Secure Boot protections. In order to load an untrusted or modified kernel, an attacker would first need to establish access to the system such as gaining physical access, obtain the ability to alter a pxe-boot network, or have remote access to a networked system with root access. With this access, an attacker could then craft a string to cause a buffer overflow by injecting a malicious payload that leads to arbitrary code execution within GRUB. The highest threat from this vulnerability is to data confidentiality and integrity as well as system availability.* CVE-2020-14308
In grub2 versions before 2.06 the grub memory allocator doesn't check for possible arithmetic overflows on the requested allocation size. This leads the function to return invalid memory allocations which can be further used to cause possible integrity, confidentiality and availability impacts during the boot process.* CVE-2020-14309
There's an issue with grub2 in all versions before 2.06 when handling squashfs filesystems containing a symbolic link with name length of UINT32 bytes in size. The name size leads to an arithmetic overflow leading to a zero-size allocation further causing a heap-based buffer overflow with attacker controlled data.* CVE-2020-14310
An integer overflow inread_section_from_stringmay lead to a heap based buffer overflow.* CVE-2020-14311
An integer overflow ingrub_ext2_read_linkmay lead to a heap-based buffer overflow.* CVE-2020-15706
GRUB2 contains a race condition ingrub_script_function_create()leading to a use-after-free vulnerability which can be triggered by redefining a function whilst the same function is already executing, leading to arbitrary code execution and secure boot restriction bypass* CVE-2020-15707
Integer overflows were discovered in the functionsgrub_cmd_initrdandgrub_initrd_initin the efilinux component of GRUB2, as shipped in Debian, Red Hat, and Ubuntu (the functionality is not included in GRUB2 upstream), leading to a heap-based buffer overflow. These could be triggered by an extremely large number of arguments to the initrd command on 32-bit architectures, or a crafted filesystem with very large files on any architecture. An attacker could use this to execute arbitrary code and bypass UEFI Secure Boot restrictions. This issue affects GRUB2 version 2.04 and prior versions.
Quoted 4 lines
Signed-off-by Stefan S?rensen <[email protected]>---
Changes since v1:
* Add Signed-off-by to patches
Please use the -N option to git format-patch as pointed out by check-package:
Applying: boot/grub2: Backport Boothole securify fixes boot/grub2/0002-yylex-Make-lexer-fatal-errors-actually-be-fatal.patch:4: generate your patches with 'git format-patch -N'
Committed after fixing that up, thanks.
Signature · 1 line
Bye, Peter Korsgaard
PATCH v2 1/1 boot/grub2: Backport Boothole securify fixes
In reply to stefan at astylos.dkQuoted 62 lines
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
"stefan" == stefan <[email protected]> writes:
From: Stefan S?rensen <[email protected]>
Details: https://lists.gnu.org/archive/html/grub-devel/2020-07/msg00034.htmlFixes the following security issues:
* CVE-2020-10713
A flaw was found in grub2, prior to version 2.06. An attacker may use the GRUB 2 flaw to hijack and tamper the GRUB verification process. This flaw also allows the bypass of Secure Boot protections. In order to load an untrusted or modified kernel, an attacker would first need to establish access to the system such as gaining physical access, obtain the ability to alter a pxe-boot network, or have remote access to a networked system with root access. With this access, an attacker could then craft a string to cause a buffer overflow by injecting a malicious payload that leads to arbitrary code execution within GRUB. The highest threat from this vulnerability is to data confidentiality and integrity as well as system availability.* CVE-2020-14308
In grub2 versions before 2.06 the grub memory allocator doesn't check for possible arithmetic overflows on the requested allocation size. This leads the function to return invalid memory allocations which can be further used to cause possible integrity, confidentiality and availability impacts during the boot process.* CVE-2020-14309
There's an issue with grub2 in all versions before 2.06 when handling squashfs filesystems containing a symbolic link with name length of UINT32 bytes in size. The name size leads to an arithmetic overflow leading to a zero-size allocation further causing a heap-based buffer overflow with attacker controlled data.* CVE-2020-14310
An integer overflow inread_section_from_stringmay lead to a heap based buffer overflow.* CVE-2020-14311
An integer overflow ingrub_ext2_read_linkmay lead to a heap-based buffer overflow.* CVE-2020-15706
GRUB2 contains a race condition ingrub_script_function_create()leading to a use-after-free vulnerability which can be triggered by redefining a function whilst the same function is already executing, leading to arbitrary code execution and secure boot restriction bypass* CVE-2020-15707
Integer overflows were discovered in the functionsgrub_cmd_initrdandgrub_initrd_initin the efilinux component of GRUB2, as shipped in Debian, Red Hat, and Ubuntu (the functionality is not included in GRUB2 upstream), leading to a heap-based buffer overflow. These could be triggered by an extremely large number of arguments to the initrd command on 32-bit architectures, or a crafted filesystem with very large files on any architecture. An attacker could use this to execute arbitrary code and bypass UEFI Secure Boot restrictions. This issue affects GRUB2 version 2.04 and prior versions.
Quoted 4 lines
Signed-off-by Stefan S?rensen <[email protected]>---
Changes since v1:
* Add Signed-off-by to patches
Committed to 2020.02.x and 2020.05.x, thanks.
Signature · 1 line
Bye, Peter Korsgaard
PATCH v2 1/1 boot/grub2: Backport Boothole securify fixes
In reply to stefan at astylos.dkHello,
Quoted 4 lines · On Mon, Aug 3, 2020 at 10:25 AM <[email protected]> wrote:
From: Stefan S?rensen <[email protected]>
Details: https://lists.gnu.org/archive/html/grub-devel/2020-07/msg00034.html
It looks like there is another batch of grub security fixes needed. As you obviously use grub, care to send patches for these as well?
https://www.openwall.com/lists/oss-security/2021/03/02/3
Thanks in advance!
Signature · 1 line
Bye, Peter Korsgaard