mirror of
https://src.fedoraproject.org/rpms/grub2.git
synced 2024-11-24 14:32:58 +00:00
a5db5fecf6
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>
38 lines
1.1 KiB
Diff
38 lines
1.1 KiB
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: Peter Jones <pjones@redhat.com>
|
|
Date: Mon, 10 Aug 2020 19:14:02 -0400
|
|
Subject: [PATCH] Fix some error returning weirdness in
|
|
grub_menu_execute_entry()
|
|
|
|
Signed-off-by: Peter Jones <pjones@redhat.com>
|
|
---
|
|
grub-core/normal/menu.c | 9 ++++++---
|
|
1 file changed, 6 insertions(+), 3 deletions(-)
|
|
|
|
diff --git a/grub-core/normal/menu.c b/grub-core/normal/menu.c
|
|
index 9ea1f411814..791eeb95d14 100644
|
|
--- a/grub-core/normal/menu.c
|
|
+++ b/grub-core/normal/menu.c
|
|
@@ -301,8 +301,8 @@ grub_menu_execute_entry(grub_menu_entry_t entry, int auto_boot)
|
|
if (err)
|
|
{
|
|
grub_print_error ();
|
|
- grub_errno = GRUB_ERR_NONE;
|
|
- return;
|
|
+ err = grub_errno = GRUB_ERR_NONE;
|
|
+ return err;
|
|
}
|
|
|
|
errs_before = grub_err_printed_errors;
|
|
@@ -315,7 +315,10 @@ grub_menu_execute_entry(grub_menu_entry_t entry, int auto_boot)
|
|
grub_env_context_open ();
|
|
menu = grub_zalloc (sizeof (*menu));
|
|
if (! menu)
|
|
- return;
|
|
+ {
|
|
+ err = grub_errno;
|
|
+ return err;
|
|
+ }
|
|
grub_env_set_menu (menu);
|
|
if (auto_boot)
|
|
grub_env_set ("timeout", "0");
|