forked from pool/grub2
7e75e7f881
- Version bump to 2.12 (PED-5589)
* Added:
- grub-2.12.tar.xz
- fix_no_extra_deps_in_release_tarball.patch
* Removed:
- grub-2.12~rc1.tar.xz
* Patch dropped as it merged into new version:
- 0001-disk-cryptodisk-Fix-missing-change-when-updating-to-.patch
- 0001-fs-btrfs-Zero-file-data-not-backed-by-extents.patch
- 0001-fs-ntfs-Fix-an-OOB-write-when-parsing-the-ATTRIBUTE_.patch
- 0002-fs-ntfs-Fix-an-OOB-read-when-reading-data-from-the-r.patch
- 0003-fs-ntfs-Fix-an-OOB-read-when-parsing-directory-entri.patch
- 0004-fs-ntfs-Fix-an-OOB-read-when-parsing-bitmaps-for-ind.patch
- 0005-fs-ntfs-Fix-an-OOB-read-when-parsing-a-volume-label.patch
- 0006-fs-ntfs-Make-code-more-readable.patch
- 0001-kern-ieee1275-init-Restrict-high-memory-in-presence-.patch
- 0001-fs-xfs-Incorrect-short-form-directory-data-boundary-.patch
- 0002-fs-xfs-Fix-XFS-directory-extent-parsing.patch
- 0003-fs-xfs-add-large-extent-counters-incompat-feature-su.patch
- 0001-mkstandalone-ensure-stable-timestamps-for-generated-.patch
- 0002-mkstandalone-ensure-deterministic-tar-file-creation-.patch
* Patch adjusted for the updated base version:
- use-grub2-as-a-package-name.patch
- grub2-s390x-04-grub2-install.patch
- grub2-btrfs-04-grub2-install.patch
- grub2-ppc64le-disable-video.patch
- 0002-AUDIT-0-http-boot-tracker-bug.patch
- 0001-Unify-the-check-to-enable-btrfs-relative-path.patch
- 0003-Handle-multi-arch-64-on-32-boot-in-linuxefi-loader.patch
- 0004-Add-suport-for-signing-grub-with-an-appended-signatu.patch
OBS-URL: https://build.opensuse.org/request/show/1138021
OBS-URL: https://build.opensuse.org/package/show/Base:System/grub2?expand=0&rev=480
59 lines
1.7 KiB
Diff
59 lines
1.7 KiB
Diff
From b5c3492f31a98f5ef0f9bec2c0665ad0b71ad5cb Mon Sep 17 00:00:00 2001
|
|
From: Sebastian Krahmer <krahmer@suse.com>
|
|
Date: Tue, 28 Nov 2017 17:24:38 +0800
|
|
Subject: [PATCH] AUDIT-0: http boot tracker bug
|
|
|
|
Fixing a memory leak in case of error, and a integer overflow, leading to a
|
|
heap overflow due to overly large chunk sizes.
|
|
|
|
We need to check against some maximum value, otherwise values like 0xffffffff
|
|
will eventually lead in the allocation functions to small sized buffers, since
|
|
the len is rounded up to the next reasonable alignment. The following memcpy
|
|
will then smash the heap, leading to RCE.
|
|
|
|
This is no big issue for pure http boot, since its going to execute an
|
|
untrusted kernel anyway, but it will break trusted boot scenarios, where only
|
|
signed code is allowed to be executed.
|
|
|
|
v2: Fix GCC 13 build failure (bsc#1201089)
|
|
|
|
Signed-off-by: Michael Chang <mchang@suse.com>
|
|
---
|
|
grub-core/net/efi/net.c | 4 +++-
|
|
grub-core/net/http.c | 5 ++++-
|
|
2 files changed, 7 insertions(+), 2 deletions(-)
|
|
|
|
--- a/grub-core/net/efi/net.c
|
|
+++ b/grub-core/net/efi/net.c
|
|
@@ -654,8 +654,10 @@
|
|
|
|
rd = efi_net_interface (read, file, chunk, sz);
|
|
|
|
- if (rd <= 0)
|
|
+ if (rd <= 0) {
|
|
+ grub_free (chunk);
|
|
return rd;
|
|
+ }
|
|
|
|
if (buf)
|
|
{
|
|
--- a/grub-core/net/http.c
|
|
+++ b/grub-core/net/http.c
|
|
@@ -30,6 +30,7 @@
|
|
GRUB_MOD_LICENSE ("GPLv3+");
|
|
|
|
#define HTTP_PORT ((grub_uint16_t) 80)
|
|
+#define HTTP_MAX_CHUNK_SIZE GRUB_INT_MAX
|
|
|
|
typedef struct http_data
|
|
{
|
|
@@ -82,6 +83,8 @@
|
|
if (data->in_chunk_len == 2)
|
|
{
|
|
data->chunk_rem = grub_strtoul (ptr, 0, 16);
|
|
+ if (data->chunk_rem > HTTP_MAX_CHUNK_SIZE)
|
|
+ return GRUB_ERR_NET_PACKET_TOO_BIG;
|
|
grub_errno = GRUB_ERR_NONE;
|
|
if (data->chunk_rem == 0)
|
|
{
|