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
79 lines
1.8 KiB
Diff
79 lines
1.8 KiB
Diff
--- a/grub-core/kern/ieee1275/openfw.c
|
|
+++ b/grub-core/kern/ieee1275/openfw.c
|
|
@@ -302,6 +302,34 @@
|
|
return args.catch_result;
|
|
}
|
|
|
|
+/* Preallocate IEEE1275_MAX_MAP_RESOURCE map tracks to track the
|
|
+ * map regions allocated to us by the firmware. Cannot
|
|
+ * dynamically allocate them, since the heap is not set
|
|
+ * yet.
|
|
+ */
|
|
+struct grub_map_track grub_map_track[IEEE1275_MAX_MAP_RESOURCE];
|
|
+int grub_map_track_index=0;
|
|
+
|
|
+void
|
|
+grub_releasemap ()
|
|
+{
|
|
+ int i=0;
|
|
+ for (i=grub_map_track_index-1; i >= 0; i--)
|
|
+ grub_ieee1275_release(grub_map_track[i].addr, grub_map_track[i].size);
|
|
+ grub_map_track_index = 0;
|
|
+ return;
|
|
+}
|
|
+
|
|
+static void
|
|
+grub_track_map (grub_addr_t addr, grub_size_t size)
|
|
+{
|
|
+ if (grub_map_track_index >= IEEE1275_MAX_MAP_RESOURCE)
|
|
+ return;
|
|
+ grub_map_track[grub_map_track_index].addr = addr;
|
|
+ grub_map_track[grub_map_track_index++].size = size;
|
|
+ return;
|
|
+}
|
|
+
|
|
grub_err_t
|
|
grub_claimmap (grub_addr_t addr, grub_size_t size)
|
|
{
|
|
@@ -317,6 +345,7 @@
|
|
return grub_errno;
|
|
}
|
|
|
|
+ grub_track_map (addr, size);
|
|
return GRUB_ERR_NONE;
|
|
}
|
|
|
|
--- a/include/grub/ieee1275/ieee1275.h
|
|
+++ b/include/grub/ieee1275/ieee1275.h
|
|
@@ -33,6 +33,12 @@
|
|
unsigned int size;
|
|
};
|
|
|
|
+#define IEEE1275_MAX_MAP_RESOURCE 10
|
|
+struct grub_map_track {
|
|
+ grub_addr_t addr;
|
|
+ grub_size_t size;
|
|
+};
|
|
+
|
|
#define IEEE1275_MAX_PROP_LEN 8192
|
|
#define IEEE1275_MAX_PATH_LEN 256
|
|
|
|
@@ -228,6 +234,7 @@
|
|
int EXPORT_FUNC(grub_ieee1275_get_block_size) (grub_ieee1275_ihandle_t ihandle);
|
|
|
|
grub_err_t EXPORT_FUNC(grub_claimmap) (grub_addr_t addr, grub_size_t size);
|
|
+void EXPORT_FUNC(grub_releasemap) (void);
|
|
|
|
int
|
|
EXPORT_FUNC(grub_ieee1275_map) (grub_addr_t phys, grub_addr_t virt,
|
|
--- a/grub-core/kern/ieee1275/init.c
|
|
+++ b/grub-core/kern/ieee1275/init.c
|
|
@@ -111,6 +111,7 @@
|
|
void
|
|
grub_exit (void)
|
|
{
|
|
+ grub_releasemap();
|
|
grub_ieee1275_exit ();
|
|
}
|
|
|