8ee92f5194
- Implement NV index mode for TPM 2.0 key protector
0001-protectors-Implement-NV-index.patch
- Fall back to passphrase mode when the key protector fails to
unlock the disk
0002-cryptodisk-Fallback-to-passphrase.patch
- Wipe out the cached key cleanly
0003-cryptodisk-wipe-out-the-cached-keys-from-protectors.patch
- Make diskfiler to look up cryptodisk devices first
0004-diskfilter-look-up-cryptodisk-devices-first.patch
- Version bump to 2.12~rc1
* Added:
- grub-2.12~rc1.tar.xz
* Removed:
- grub-2.06.tar.xz
* Patch dropped merged by new version:
- grub2-GRUB_CMDLINE_LINUX_RECOVERY-for-recovery-mode.patch
- grub2-s390x-02-kexec-module-added-to-emu.patch
- grub2-efi-chainloader-root.patch
- grub2-Fix-incorrect-netmask-on-ppc64.patch
- 0001-osdep-Introduce-include-grub-osdep-major.h-and-use-i.patch
- 0002-osdep-linux-hostdisk-Use-stat-instead-of-udevadm-for.patch
- 0002-net-read-bracketed-ipv6-addrs-and-port-numbers.patch
- grub2-s390x-10-keep-network-at-kexec.patch
- 0001-Fix-build-error-in-binutils-2.36.patch
- 0001-emu-fix-executable-stack-marking.patch
- 0046-squash-verifiers-Move-verifiers-API-to-kernel-image.patch
- 0001-30_uefi-firmware-fix-printf-format-with-null-byte.patch
- 0001-tpm-Pass-unknown-error-as-non-fatal-but-debug-print-.patch
- 0001-Filter-out-POSIX-locale-for-translation.patch
OBS-URL: https://build.opensuse.org/request/show/1105405
OBS-URL: https://build.opensuse.org/package/show/Base:System/grub2?expand=0&rev=458
110 lines
2.8 KiB
Diff
110 lines
2.8 KiB
Diff
From c2475f1337dff2e2a3e45514119d5186e55753c1 Mon Sep 17 00:00:00 2001
|
|
From: Michael Chang <mchang@suse.com>
|
|
Date: Thu, 13 Aug 2020 09:36:45 +0800
|
|
Subject: [PATCH] kern/mm.c : Make grub_calloc inline
|
|
|
|
To circumvent the situation that symbol 'grub_calloc' not found would
|
|
happen if system is using stray grub (ie not managed by system update)
|
|
as stage1 that can be too old to load updated modules.
|
|
---
|
|
grub-core/kern/mm.c | 28 ----------------------------
|
|
include/grub/mm.h | 32 +++++++++++++++++++++++++++++++-
|
|
2 files changed, 31 insertions(+), 29 deletions(-)
|
|
|
|
--- a/grub-core/kern/mm.c
|
|
+++ b/grub-core/kern/mm.c
|
|
@@ -63,14 +63,10 @@
|
|
|
|
#include <config.h>
|
|
#include <grub/mm.h>
|
|
-#include <grub/misc.h>
|
|
-#include <grub/err.h>
|
|
#include <grub/types.h>
|
|
#include <grub/disk.h>
|
|
#include <grub/dl.h>
|
|
-#include <grub/i18n.h>
|
|
#include <grub/mm_private.h>
|
|
-#include <grub/safemath.h>
|
|
|
|
#ifdef MM_DEBUG
|
|
# undef grub_calloc
|
|
@@ -553,30 +549,6 @@
|
|
return 0;
|
|
}
|
|
|
|
-/*
|
|
- * Allocate NMEMB instances of SIZE bytes and return the pointer, or error on
|
|
- * integer overflow.
|
|
- */
|
|
-void *
|
|
-grub_calloc (grub_size_t nmemb, grub_size_t size)
|
|
-{
|
|
- void *ret;
|
|
- grub_size_t sz = 0;
|
|
-
|
|
- if (grub_mul (nmemb, size, &sz))
|
|
- {
|
|
- grub_error (GRUB_ERR_OUT_OF_RANGE, N_("overflow is detected"));
|
|
- return NULL;
|
|
- }
|
|
-
|
|
- ret = grub_memalign (0, sz);
|
|
- if (!ret)
|
|
- return NULL;
|
|
-
|
|
- grub_memset (ret, 0, sz);
|
|
- return ret;
|
|
-}
|
|
-
|
|
/* Allocate SIZE bytes and return the pointer. */
|
|
void *
|
|
grub_malloc (grub_size_t size)
|
|
--- a/include/grub/mm.h
|
|
+++ b/include/grub/mm.h
|
|
@@ -47,7 +47,6 @@
|
|
#endif
|
|
|
|
void grub_mm_init_region (void *addr, grub_size_t size);
|
|
-void *EXPORT_FUNC(grub_calloc) (grub_size_t nmemb, grub_size_t size);
|
|
void *EXPORT_FUNC(grub_malloc) (grub_size_t size);
|
|
void *EXPORT_FUNC(grub_zalloc) (grub_size_t size);
|
|
void EXPORT_FUNC(grub_free) (void *ptr);
|
|
@@ -55,6 +54,37 @@
|
|
#ifndef GRUB_MACHINE_EMU
|
|
void *EXPORT_FUNC(grub_memalign) (grub_size_t align, grub_size_t size);
|
|
#endif
|
|
+#if !defined(GRUB_UTIL) && !defined (GRUB_MACHINE_EMU)
|
|
+#include <grub/misc.h>
|
|
+#include <grub/err.h>
|
|
+#include <grub/i18n.h>
|
|
+#include <grub/safemath.h>
|
|
+/*
|
|
+ * Allocate NMEMB instances of SIZE bytes and return the pointer, or error on
|
|
+ * integer overflow.
|
|
+ */
|
|
+static inline void *
|
|
+grub_calloc (grub_size_t nmemb, grub_size_t size)
|
|
+{
|
|
+ void *ret;
|
|
+ grub_size_t sz = 0;
|
|
+
|
|
+ if (grub_mul (nmemb, size, &sz))
|
|
+ {
|
|
+ grub_error (GRUB_ERR_OUT_OF_RANGE, N_("overflow is detected"));
|
|
+ return NULL;
|
|
+ }
|
|
+
|
|
+ ret = grub_memalign (0, sz);
|
|
+ if (!ret)
|
|
+ return NULL;
|
|
+
|
|
+ grub_memset (ret, 0, sz);
|
|
+ return ret;
|
|
+}
|
|
+#else
|
|
+void *EXPORT_FUNC(grub_calloc) (grub_size_t nmemb, grub_size_t size);
|
|
+#endif
|
|
|
|
void grub_mm_check_real (const char *file, int line);
|
|
#define grub_mm_check() grub_mm_check_real (GRUB_FILE, __LINE__);
|