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
54 lines
1.5 KiB
Diff
54 lines
1.5 KiB
Diff
From c0d00403a297d6023eab6189ba87dc8a3f6d1e85 Mon Sep 17 00:00:00 2001
|
|
From: Michael Chang <mchang@suse.com>
|
|
Date: Mon, 7 Feb 2022 20:44:40 +0800
|
|
Subject: [PATCH 2/5] Add grub_disk_write_tail helper function
|
|
|
|
This helps in writing data to partition where the end of buffer is
|
|
aligned to end of partition.
|
|
|
|
Signed-off-by: Michael Chang <mchang@suse.com>
|
|
---
|
|
grub-core/lib/disk.c | 18 ++++++++++++++++++
|
|
include/grub/disk.h | 3 +++
|
|
2 files changed, 21 insertions(+)
|
|
|
|
--- a/grub-core/lib/disk.c
|
|
+++ b/grub-core/lib/disk.c
|
|
@@ -52,6 +52,24 @@
|
|
}
|
|
|
|
grub_err_t
|
|
+grub_disk_write_tail (grub_disk_t disk, grub_size_t size, const void *buf)
|
|
+{
|
|
+ grub_partition_t part;
|
|
+ grub_disk_addr_t sector;
|
|
+ grub_off_t offset;
|
|
+
|
|
+ if (!disk->partition)
|
|
+ return GRUB_ERR_NONE;
|
|
+
|
|
+ part = disk->partition;
|
|
+ sector = part->len;
|
|
+ sector -= (size + GRUB_DISK_SECTOR_SIZE - 1) >> GRUB_DISK_SECTOR_BITS;
|
|
+ offset = size & (GRUB_DISK_SECTOR_SIZE - 1);
|
|
+
|
|
+ return grub_disk_write (disk, sector, offset, size, buf);
|
|
+}
|
|
+
|
|
+grub_err_t
|
|
grub_disk_write (grub_disk_t disk, grub_disk_addr_t sector,
|
|
grub_off_t offset, grub_size_t size, const void *buf)
|
|
{
|
|
--- a/include/grub/disk.h
|
|
+++ b/include/grub/disk.h
|
|
@@ -252,6 +252,9 @@
|
|
grub_off_t offset,
|
|
grub_size_t size,
|
|
void *buf);
|
|
+grub_err_t grub_disk_write_tail (grub_disk_t disk,
|
|
+ grub_size_t size,
|
|
+ const void *buf);
|
|
grub_err_t grub_disk_write (grub_disk_t disk,
|
|
grub_disk_addr_t sector,
|
|
grub_off_t offset,
|