mirror of
https://src.fedoraproject.org/rpms/grub2.git
synced 2024-11-28 15:46:53 +00:00
47cf63735c
Resolves: CVE-2020-10713 Resolves: CVE-2020-14308 Resolves: CVE-2020-14309 Resolves: CVE-2020-14310 Resolves: CVE-2020-14311 Resolves: CVE-2020-15705 Resolves: CVE-2020-15706 Resolves: CVE-2020-15707 Signed-off-by: Peter Jones <pjones@redhat.com>
40 lines
1.5 KiB
Diff
40 lines
1.5 KiB
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: Javier Martinez Canillas <javierm@redhat.com>
|
|
Date: Tue, 9 Apr 2019 13:12:40 +0200
|
|
Subject: [PATCH] Don't assume that boot commands will only return on fail
|
|
|
|
While it's true that for most loaders the boot command never returns, it
|
|
may be the case that it does. For example the GRUB emulator boot command
|
|
calls to systemctl kexec which in turn does an asynchonous call to kexec.
|
|
|
|
So in this case GRUB will wrongly assume that the boot command fails and
|
|
print a "Failed to boot both default and fallback entries" even when the
|
|
kexec call later succeeds.
|
|
|
|
Signed-off-by: Javier Martinez Canillas <javierm@redhat.com>
|
|
---
|
|
grub-core/normal/menu.c | 4 ++--
|
|
1 file changed, 2 insertions(+), 2 deletions(-)
|
|
|
|
diff --git a/grub-core/normal/menu.c b/grub-core/normal/menu.c
|
|
index 9ea1f411814..14ceb9bb060 100644
|
|
--- a/grub-core/normal/menu.c
|
|
+++ b/grub-core/normal/menu.c
|
|
@@ -302,7 +302,7 @@ grub_menu_execute_entry(grub_menu_entry_t entry, int auto_boot)
|
|
{
|
|
grub_print_error ();
|
|
grub_errno = GRUB_ERR_NONE;
|
|
- return;
|
|
+ return grub_errno;
|
|
}
|
|
|
|
errs_before = grub_err_printed_errors;
|
|
@@ -315,7 +315,7 @@ grub_menu_execute_entry(grub_menu_entry_t entry, int auto_boot)
|
|
grub_env_context_open ();
|
|
menu = grub_zalloc (sizeof (*menu));
|
|
if (! menu)
|
|
- return;
|
|
+ return grub_errno;
|
|
grub_env_set_menu (menu);
|
|
if (auto_boot)
|
|
grub_env_set ("timeout", "0");
|