!150 [sync] PR-143: fix setupmode variable not exit in some machine

From: @openeuler-sync-bot 
Reviewed-by: @t_feng 
Signed-off-by: @t_feng

0205-fix-setupmode-not-available-in-some-machine.patch

@@ -0,0 +1,48 @@
+From 4fc72f509627da808b452eb1186282237c449b65 Mon Sep 17 00:00:00 2001
+From: fengtao <fengtao40@huawei.com>
+Date: Tue, 22 Mar 2022 22:22:22 +0800
+Subject: [PATCH] fix setupmode not available in some machine
+
+In some machine, there is no setupmode variable, so we should 
+give setupmode a default vaule: setup_mode = 0
+
+if we cannot get setupmode variable, we use setup_mode instead.
+
+---
+ grub-core/kern/efi/sb.c | 12 ++++++++++--
+ 1 file changed, 10 insertions(+), 2 deletions(-)
+
+diff --git a/grub-core/kern/efi/sb.c b/grub-core/kern/efi/sb.c
+index c52ec62..f58fb13 100644
+--- a/grub-core/kern/efi/sb.c
++++ b/grub-core/kern/efi/sb.c
+@@ -50,6 +50,7 @@ grub_efi_get_secureboot (void)
+   grub_uint8_t *moksbstate = NULL;
+   grub_uint8_t secureboot = GRUB_EFI_SECUREBOOT_MODE_UNKNOWN;
+   const char *secureboot_str = "UNKNOWN";
++  grub_uint8_t setup_mode = 0;
+ 
+   status = grub_efi_get_variable ("SecureBoot", &efi_variable_guid,
+ 				  &size, (void **) &secboot);
+@@ -67,9 +68,16 @@ grub_efi_get_secureboot (void)
+ 				  &size, (void **) &setupmode);
+ 
+   if (status != GRUB_EFI_SUCCESS)
+-    goto out;
++    {
++      grub_dprintf ("efi", "No SetupMode variable\n");
++    }
++  else
++    {
++      grub_dprintf ("efi", "SetupMode: %d\n", *setupmode);
++      setup_mode = *setupmode;
++    }
+ 
+-  if ((*secboot == 0) || (*setupmode == 1))
++  if ((*secboot == 0) || (setup_mode == 1))
+     {
+       secureboot = GRUB_EFI_SECUREBOOT_MODE_DISABLED;
+       goto out;
+-- 
+2.23.0
+

grub.patches

@@ -202,3 +202,4 @@ Patch0201: 0201-fs-btrfs-Use-full-btrfs-bootloader-area.patch
 Patch0202: grub2-set-password-prompts-to-enter-the-current-pass.patch
 Patch0203: support-TPM2.0.patch
 Patch0204: use-default-timestamp.patch
+Patch0205: 0205-fix-setupmode-not-available-in-some-machine.patch

grub2.spec

@@ -14,7 +14,7 @@
 Name:		grub2
 Epoch:		1
 Version:	2.06
-Release:	1
+Release:	2
 Summary:	Bootloader with support for Linux, Multiboot and more
 License:	GPLv3+
 URL:		http://www.gnu.org/software/grub/
@@ -426,6 +426,12 @@ fi
 %{_datadir}/man/man*
 
 %changelog
+* Tue Mar 22 2022 fengtao <fengtao40@huawei.com> - 2.06-2
+- Type:bugfix
+- CVE:NA
+- SUG:NA
+- DESC:fix setupmode not available in some machine
+
 * Tue Mar 22 2022 zhangqiumiao <zhangqiumiao1@huawei.com> - 2.06-1
 - Type:bugfix
 - CVE:NA