grub-mkconfig: Restore umask for the grub.cfg. CVE-2021-3981

Apply patch from upstream,

Closes: #1001414

diff --git a/debian/changelog b/debian/changelog
index e8e64998793050517d4c8bbcd55629a289cce2a0..175f21eb9213f1b9e4678e19ea78ef177d272592 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -7,8 +7,10 @@ grub2 (2.06-8) UNRELEASED; urgency=medium
   * Switch build-deps from gcc-10 to gcc-12. Closes: #1022184
   * Include upstream patch to enable EFI zboot support on arm64.
     Closes: #1026092
+  * grub-mkconfig: Restore umask for the grub.cfg. CVE-2021-3981
+    Closes: #1001414
 
- -- Steve McIntyre <93sam@debian.org>  Sun, 11 Dec 2022 12:08:44 +0000
+ -- Steve McIntyre <93sam@debian.org>  Thu, 29 Dec 2022 13:36:22 +0000
 
 grub2 (2.06-7) unstable; urgency=medium
 

diff --git a/debian/patches/grub_mkconfig_restore_umask.patch b/debian/patches/grub_mkconfig_restore_umask.patch
new file mode 100644 (file)
index 0000000..bd85cfc
--- /dev/null
+++ b/debian/patches/grub_mkconfig_restore_umask.patch
@@ -0,0 +1,36 @@
+commit 0adec29674561034771c13e446069b41ef41e4d4
+Author: Michael Chang <mchang@suse.com>
+Date:   Fri Dec 3 16:13:28 2021 +0800
+
+    grub-mkconfig: Restore umask for the grub.cfg
+    
+    The commit ab2e53c8a (grub-mkconfig: Honor a symlink when generating
+    configuration by grub-mkconfig) has inadvertently discarded umask for
+    creating grub.cfg in the process of running grub-mkconfig. The resulting
+    wrong permission (0644) would allow unprivileged users to read GRUB
+    configuration file content. This presents a low confidentiality risk
+    as grub.cfg may contain non-secured plain-text passwords.
+    
+    This patch restores the missing umask and sets the creation file mode
+    to 0600 preventing unprivileged access.
+    
+    Fixes: CVE-2021-3981
+    
+    Signed-off-by: Michael Chang <mchang@suse.com>
+    Reviewed-by: Daniel Kiper <daniel.kiper@oracle.com>
+
+diff --git a/util/grub-mkconfig.in b/util/grub-mkconfig.in
+index c3ea7612e..62335d027 100644
+--- a/util/grub-mkconfig.in
++++ b/util/grub-mkconfig.in
+@@ -301,7 +301,10 @@ and /etc/grub.d/* files or please file a bug report with
+     exit 1
+   else
+     # none of the children aborted with error, install the new grub.cfg
++    oldumask=$(umask)
++    umask 077
+     cat ${grub_cfg}.new > ${grub_cfg}
++    umask $oldumask
+     rm -f ${grub_cfg}.new
+   fi
+ fi

diff --git a/debian/patches/series b/debian/patches/series
index a4f041a232fe86e4e4139fa06209fcf7d50295aa..f0cfc8c9dcc3614306b90369bf301a21b9a68ba3 100644 (file)
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -111,3 +111,4 @@ gcc12_build_dangling_pointer.patch
 gcc12_build_array_bounds.patch
 gcc12_build_array_bounds2.patch
 arm64_remove_magic_number_check.patch
+grub_mkconfig_restore_umask.patch