forked from pool/grub2
8ee92f5194
- Implement NV index mode for TPM 2.0 key protector
0001-protectors-Implement-NV-index.patch
- Fall back to passphrase mode when the key protector fails to
unlock the disk
0002-cryptodisk-Fallback-to-passphrase.patch
- Wipe out the cached key cleanly
0003-cryptodisk-wipe-out-the-cached-keys-from-protectors.patch
- Make diskfiler to look up cryptodisk devices first
0004-diskfilter-look-up-cryptodisk-devices-first.patch
- Version bump to 2.12~rc1
* Added:
- grub-2.12~rc1.tar.xz
* Removed:
- grub-2.06.tar.xz
* Patch dropped merged by new version:
- grub2-GRUB_CMDLINE_LINUX_RECOVERY-for-recovery-mode.patch
- grub2-s390x-02-kexec-module-added-to-emu.patch
- grub2-efi-chainloader-root.patch
- grub2-Fix-incorrect-netmask-on-ppc64.patch
- 0001-osdep-Introduce-include-grub-osdep-major.h-and-use-i.patch
- 0002-osdep-linux-hostdisk-Use-stat-instead-of-udevadm-for.patch
- 0002-net-read-bracketed-ipv6-addrs-and-port-numbers.patch
- grub2-s390x-10-keep-network-at-kexec.patch
- 0001-Fix-build-error-in-binutils-2.36.patch
- 0001-emu-fix-executable-stack-marking.patch
- 0046-squash-verifiers-Move-verifiers-API-to-kernel-image.patch
- 0001-30_uefi-firmware-fix-printf-format-with-null-byte.patch
- 0001-tpm-Pass-unknown-error-as-non-fatal-but-debug-print-.patch
- 0001-Filter-out-POSIX-locale-for-translation.patch
OBS-URL: https://build.opensuse.org/request/show/1105405
OBS-URL: https://build.opensuse.org/package/show/Base:System/grub2?expand=0&rev=458
60 lines
1.8 KiB
Diff
60 lines
1.8 KiB
Diff
From 9f18541245858f53fea72d8d60304f9015d88b5f Mon Sep 17 00:00:00 2001
|
|
From: Michael Chang <mchang@suse.com>
|
|
Date: Fri, 17 Mar 2023 22:00:23 +0800
|
|
Subject: [PATCH 2/2] Restrict cryptsetup key file permission for better
|
|
security
|
|
|
|
GRUB's default permission 777 for concatenated initrd files was too
|
|
permissive for the cryptsetup key file, causing a complaint from
|
|
systemd-cryptsetup during boot. This commit replaces the 0777 permission
|
|
with a more secure 0400 permission for the key file.
|
|
|
|
Signed-off-by: Michael Chang <mchang@suse.com>
|
|
---
|
|
grub-core/loader/linux.c | 6 +++++-
|
|
1 file changed, 5 insertions(+), 1 deletion(-)
|
|
|
|
--- a/grub-core/loader/linux.c
|
|
+++ b/grub-core/loader/linux.c
|
|
@@ -32,6 +32,7 @@
|
|
char *buf;
|
|
char *newc_name;
|
|
grub_off_t size;
|
|
+ grub_uint32_t mode;
|
|
};
|
|
|
|
struct dir
|
|
@@ -203,6 +204,7 @@
|
|
grub_memcpy (comp->buf, buf, bufsz);
|
|
initrd_ctx->nfiles++;
|
|
comp->size = bufsz;
|
|
+ comp->mode = 0100400;
|
|
if (grub_add (initrd_ctx->size, comp->size,
|
|
&initrd_ctx->size))
|
|
goto overflow;
|
|
@@ -272,6 +274,7 @@
|
|
grub_initrd_close (initrd_ctx);
|
|
return grub_errno;
|
|
}
|
|
+ initrd_ctx->components[i].mode = 0100777;
|
|
name_len = grub_strlen (initrd_ctx->components[i].newc_name) + 1;
|
|
if (grub_add (initrd_ctx->size,
|
|
ALIGN_UP (sizeof (struct newc_head) + name_len, 4),
|
|
@@ -374,6 +377,7 @@
|
|
if (initrd_ctx->components[i].newc_name)
|
|
{
|
|
grub_size_t dir_size;
|
|
+ grub_uint32_t mode = initrd_ctx->components[i].mode;
|
|
|
|
if (insert_dir (initrd_ctx->components[i].newc_name, &root, ptr,
|
|
&dir_size))
|
|
@@ -385,7 +389,7 @@
|
|
ptr += dir_size;
|
|
ptr = make_header (ptr, initrd_ctx->components[i].newc_name,
|
|
grub_strlen (initrd_ctx->components[i].newc_name) + 1,
|
|
- 0100777,
|
|
+ mode,
|
|
initrd_ctx->components[i].size);
|
|
newc = 1;
|
|
}
|