be3181b1eb
- VUL-0: grub2,shim: implement new SBAT method (bsc#1182057) * 0031-util-mkimage-Remove-unused-code-to-add-BSS-section.patch * 0032-util-mkimage-Use-grub_host_to_target32-instead-of-gr.patch * 0033-util-mkimage-Always-use-grub_host_to_target32-to-ini.patch * 0034-util-mkimage-Unify-more-of-the-PE32-and-PE32-header-.patch * 0035-util-mkimage-Reorder-PE-optional-header-fields-set-u.patch * 0036-util-mkimage-Improve-data_size-value-calculation.patch * 0037-util-mkimage-Refactor-section-setup-to-use-a-helper.patch * 0038-util-mkimage-Add-an-option-to-import-SBAT-metadata-i.patch * 0039-grub-install-common-Add-sbat-option.patch - Fix CVE-2021-20225 (bsc#1182262) * 0022-lib-arg-Block-repeated-short-options-that-require-an.patch - Fix CVE-2020-27749 (bsc#1179264) * 0024-kern-parser-Fix-resource-leak-if-argc-0.patch * 0025-kern-parser-Fix-a-memory-leak.patch * 0026-kern-parser-Introduce-process_char-helper.patch * 0027-kern-parser-Introduce-terminate_arg-helper.patch * 0028-kern-parser-Refactor-grub_parser_split_cmdline-clean.patch * 0029-kern-buffer-Add-variable-sized-heap-buffer.patch * 0030-kern-parser-Fix-a-stack-buffer-overflow.patch - Fix CVE-2021-20233 (bsc#1182263) * 0023-commands-menuentry-Fix-quoting-in-setparams_prefix.patch - Fix CVE-2020-25647 (bsc#1177883) * 0021-usb-Avoid-possible-out-of-bound-accesses-caused-by-m.patch - Fix CVE-2020-25632 (bsc#1176711) * 0020-dl-Only-allow-unloading-modules-that-are-not-depende.patch - Fix CVE-2020-27779, CVE-2020-14372 (bsc#1179265) (bsc#1175970) * 0001-include-grub-i386-linux.h-Include-missing-grub-types.patch * 0002-efi-Make-shim_lock-GUID-and-protocol-type-public.patch * 0003-efi-Return-grub_efi_status_t-from-grub_efi_get_varia.patch OBS-URL: https://build.opensuse.org/request/show/876326 OBS-URL: https://build.opensuse.org/package/show/Base:System/grub2?expand=0&rev=374
40 lines
1.3 KiB
Diff
40 lines
1.3 KiB
Diff
From f756ab3eac93346c3945eeb254773436ea3e1607 Mon Sep 17 00:00:00 2001
|
||
From: Javier Martinez Canillas <javierm@redhat.com>
|
||
Date: Thu, 3 Dec 2020 16:01:43 +0100
|
||
Subject: [PATCH 01/46] include/grub/i386/linux.h: Include missing
|
||
<grub/types.h> header
|
||
MIME-Version: 1.0
|
||
Content-Type: text/plain; charset=UTF-8
|
||
Content-Transfer-Encoding: 8bit
|
||
|
||
This header uses types defined in <grub/types.h> but does not include it,
|
||
which leads to compile errors like the following:
|
||
|
||
In file included from ../include/grub/cpu/linux.h:19,
|
||
from kern/efi/sb.c:21:
|
||
../include/grub/i386/linux.h:80:3: error: unknown type name ‘grub_uint64_t’
|
||
80 | grub_uint64_t addr;
|
||
|
||
Signed-off-by: Javier Martinez Canillas <javierm@redhat.com>
|
||
Reviewed-by: Daniel Kiper <daniel.kiper@oracle.com>
|
||
---
|
||
include/grub/i386/linux.h | 2 ++
|
||
1 file changed, 2 insertions(+)
|
||
|
||
diff --git a/include/grub/i386/linux.h b/include/grub/i386/linux.h
|
||
index ce30e7fb0..6da5f030f 100644
|
||
--- a/include/grub/i386/linux.h
|
||
+++ b/include/grub/i386/linux.h
|
||
@@ -19,6 +19,8 @@
|
||
#ifndef GRUB_I386_LINUX_HEADER
|
||
#define GRUB_I386_LINUX_HEADER 1
|
||
|
||
+#include <grub/types.h>
|
||
+
|
||
#define GRUB_LINUX_I386_MAGIC_SIGNATURE 0x53726448 /* "HdrS" */
|
||
#define GRUB_LINUX_DEFAULT_SETUP_SECTS 4
|
||
#define GRUB_LINUX_INITRD_MAX_ADDRESS 0x37FFFFFF
|
||
--
|
||
2.26.2
|
||
|