d6d145b71a
- Power guest secure boot with static keys: GRUB2 signing portion (jsc#SLE-18271) (bsc#1192764) * grub2.spec - Power guest secure boot with static keys: GRUB2 portion (jsc#SLE-18144) (bsc#1192686) * 0001-ieee1275-Drop-HEAP_MAX_ADDR-and-HEAP_MIN_SIZE-consta.patch * 0002-ieee1275-claim-more-memory.patch * 0003-ieee1275-request-memory-with-ibm-client-architecture.patch * 0004-Add-suport-for-signing-grub-with-an-appended-signatu.patch * 0005-docs-grub-Document-signing-grub-under-UEFI.patch * 0006-docs-grub-Document-signing-grub-with-an-appended-sig.patch * 0007-dl-provide-a-fake-grub_dl_set_persistent-for-the-emu.patch * 0008-pgp-factor-out-rsa_pad.patch * 0009-crypto-move-storage-for-grub_crypto_pk_-to-crypto.c.patch * 0010-posix_wrap-tweaks-in-preparation-for-libtasn1.patch * 0011-libtasn1-import-libtasn1-4.18.0.patch * 0012-libtasn1-disable-code-not-needed-in-grub.patch * 0013-libtasn1-changes-for-grub-compatibility.patch * 0014-libtasn1-compile-into-asn1-module.patch * 0015-test_asn1-test-module-for-libtasn1.patch * 0016-grub-install-support-embedding-x509-certificates.patch * 0017-appended-signatures-import-GNUTLS-s-ASN.1-descriptio.patch * 0018-appended-signatures-parse-PKCS-7-signedData-and-X.50.patch * 0019-appended-signatures-support-verifying-appended-signa.patch * 0020-appended-signatures-verification-tests.patch * 0021-appended-signatures-documentation.patch * 0022-ieee1275-enter-lockdown-based-on-ibm-secure-boot.patch * 0023-x509-allow-Digitial-Signature-plus-other-Key-Usages.patch - Fix no menuentry is found if hibernation on btrfs RAID1 (bsc#1193090) OBS-URL: https://build.opensuse.org/request/show/945751 OBS-URL: https://build.opensuse.org/package/show/Base:System/grub2?expand=0&rev=401
83 lines
3.1 KiB
Diff
83 lines
3.1 KiB
Diff
From 41589d37934c7e4c464a584939de0137af7a181b Mon Sep 17 00:00:00 2001
|
|
From: Daniel Axtens <dja@axtens.net>
|
|
Date: Tue, 20 Jul 2021 17:14:46 -0400
|
|
Subject: [PATCH 01/23] ieee1275: Drop HEAP_MAX_ADDR and HEAP_MIN_SIZE
|
|
constants
|
|
|
|
The HEAP_MAX_ADDR is confusing. Currently it is set to 32MB, except on
|
|
ieee1275 on x86, where it is 64MB.
|
|
|
|
There is a comment which purports to explain it:
|
|
|
|
/* If possible, we will avoid claiming heap above this address, because it
|
|
seems to cause relocation problems with OSes that link at 4 MiB */
|
|
|
|
This doesn't make a lot of sense when the constants are well above 4MB
|
|
already. It was not always this way. Prior to commit 7b5d0fe4440c
|
|
(Increase heap limit) in 2010, HEAP_MAX_SIZE and HEAP_MAX_ADDR were
|
|
indeed 4MB. However, when the constants were increased the comment was
|
|
left unchanged.
|
|
|
|
It's been over a decade. It doesn't seem like we have problems with
|
|
claims over 4MB on powerpc or x86 ieee1275. The SPARC does things
|
|
completely differently and never used the constant.
|
|
|
|
Drop the constant and the check.
|
|
|
|
The only use of HEAP_MIN_SIZE was to potentially override the
|
|
HEAP_MAX_ADDR check. It is now unused. Remove it too.
|
|
|
|
Signed-off-by: Daniel Axtens <dja@axtens.net>
|
|
Signed-off-by: Stefan Berger <stefanb@linux.ibm.com>
|
|
Tested-by: Stefan Berger <stefanb@linux.ibm.com>
|
|
Reviewed-by: Daniel Kiper <daniel.kiper@oracle.com>
|
|
---
|
|
grub-core/kern/ieee1275/init.c | 17 -----------------
|
|
1 file changed, 17 deletions(-)
|
|
|
|
diff --git a/grub-core/kern/ieee1275/init.c b/grub-core/kern/ieee1275/init.c
|
|
index 1187492ae..c15d40e55 100644
|
|
--- a/grub-core/kern/ieee1275/init.c
|
|
+++ b/grub-core/kern/ieee1275/init.c
|
|
@@ -45,9 +45,6 @@
|
|
#include <grub/machine/kernel.h>
|
|
#endif
|
|
|
|
-/* The minimal heap size we can live with. */
|
|
-#define HEAP_MIN_SIZE (unsigned long) (2 * 1024 * 1024)
|
|
-
|
|
/* The maximum heap size we're going to claim */
|
|
#ifdef __i386__
|
|
#define HEAP_MAX_SIZE (unsigned long) (64 * 1024 * 1024)
|
|
@@ -55,14 +52,6 @@
|
|
#define HEAP_MAX_SIZE (unsigned long) (32 * 1024 * 1024)
|
|
#endif
|
|
|
|
-/* If possible, we will avoid claiming heap above this address, because it
|
|
- seems to cause relocation problems with OSes that link at 4 MiB */
|
|
-#ifdef __i386__
|
|
-#define HEAP_MAX_ADDR (unsigned long) (64 * 1024 * 1024)
|
|
-#else
|
|
-#define HEAP_MAX_ADDR (unsigned long) (32 * 1024 * 1024)
|
|
-#endif
|
|
-
|
|
extern char _start[];
|
|
extern char _end[];
|
|
|
|
@@ -184,12 +173,6 @@ heap_init (grub_uint64_t addr, grub_uint64_t len, grub_memory_type_t type,
|
|
if (*total + len > HEAP_MAX_SIZE)
|
|
len = HEAP_MAX_SIZE - *total;
|
|
|
|
- /* Avoid claiming anything above HEAP_MAX_ADDR, if possible. */
|
|
- if ((addr < HEAP_MAX_ADDR) && /* if it's too late, don't bother */
|
|
- (addr + len > HEAP_MAX_ADDR) && /* if it wasn't available anyway, don't bother */
|
|
- (*total + (HEAP_MAX_ADDR - addr) > HEAP_MIN_SIZE)) /* only limit ourselves when we can afford to */
|
|
- len = HEAP_MAX_ADDR - addr;
|
|
-
|
|
/* In theory, firmware should already prevent this from happening by not
|
|
listing our own image in /memory/available. The check below is intended
|
|
as a safeguard in case that doesn't happen. However, it doesn't protect
|
|
--
|
|
2.31.1
|
|
|