mirror of
https://src.fedoraproject.org/rpms/grub2.git
synced 2024-10-19 10:07:12 +00:00
b141171629
- Remove -fcf-protection compiler flag to allow i386 builds (law) Related: rhbz#1915452 - Unify GRUB configuration file location across all platforms Related: rhbz#1918817 - Add 'at_keyboard_fallback_set' var to force the set manually (rmetrich) - Add appended signatures support for ppc64le LPAR Secure Boot (daxtens) Signed-off-by: Javier Martinez Canillas <javierm@redhat.com>
44 lines
1.2 KiB
Diff
44 lines
1.2 KiB
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: Daniel Axtens <dja@axtens.net>
|
|
Date: Thu, 30 Jul 2020 00:13:21 +1000
|
|
Subject: [PATCH] dl: provide a fake grub_dl_set_persistent for the emu target
|
|
|
|
Trying to start grub-emu with a module that calls grub_dl_set_persistent
|
|
will crash because grub-emu fakes modules and passes NULL to the module
|
|
init function.
|
|
|
|
Provide an empty function for the emu case.
|
|
|
|
Fixes: ee7808e2197c (dl: Add support for persistent modules)
|
|
Signed-off-by: Daniel Axtens <dja@axtens.net>
|
|
---
|
|
include/grub/dl.h | 11 +++++++++++
|
|
1 file changed, 11 insertions(+)
|
|
|
|
diff --git a/include/grub/dl.h b/include/grub/dl.h
|
|
index 4fe2b524f73..177bcd67a25 100644
|
|
--- a/include/grub/dl.h
|
|
+++ b/include/grub/dl.h
|
|
@@ -243,11 +243,22 @@ grub_dl_get (const char *name)
|
|
return 0;
|
|
}
|
|
|
|
+#ifdef GRUB_MACHINE_EMU
|
|
+/*
|
|
+ * Under grub-emu, modules are faked and NULL is passed to GRUB_MOD_INIT.
|
|
+ * So we fake this out to avoid a NULL deref.
|
|
+ */
|
|
+static inline void
|
|
+grub_dl_set_persistent (grub_dl_t mod __attribute__((unused)))
|
|
+{
|
|
+}
|
|
+#else
|
|
static inline void
|
|
grub_dl_set_persistent (grub_dl_t mod)
|
|
{
|
|
mod->persistent = 1;
|
|
}
|
|
+#endif
|
|
|
|
static inline int
|
|
grub_dl_is_persistent (grub_dl_t mod)
|