16ab868efc
- Update to 0.4
- Rebase patches
+ shim-suse-build.patch
+ shim-mokmanager-support-crypt-hash-method.patch
+ shim-bnc804631-fix-broken-bootpath.patch
+ shim-bnc798043-no-doulbe-separators.patch
+ shim-bnc807760-change-pxe-2nd-loader-name.patch
+ shim-bnc808106-correct-certcount.patch
+ shim-mokmanager-ui-revamp.patch
- Add patches
+ shim-merge-lf-loader-code.patch: merge the Linux Foundation
loader UI code
+ shim-fix-pointer-casting.patch: fix a casting issue and the
size of an empty vendor cert
+ shim-fix-simple-file-selector.patch: fix the buffer allocation
in the simple file selector
- Remove upstreamed patches
+ shim-support-mok-delete.patch
+ shim-reboot-after-changes.patch
+ shim-clear-queued-key.patch
+ shim-local-key-sign-mokmanager.patch
+ shim-get-2nd-stage-loader.patch
+ shim-fix-loadoptions.patch
- Remove unused patch: shim-mokmanager-new-pw-hash.patch and
shim-keep-unsigned-mokmanager.patch
- Install the vendor certificate to /etc/uefi/certs
OBS-URL: https://build.opensuse.org/request/show/184039
OBS-URL: https://build.opensuse.org/package/show/devel:openSUSE:Factory/shim?expand=0&rev=28
65 lines
1.6 KiB
Diff
65 lines
1.6 KiB
Diff
From bfffac234fabdf8110e8e8c53557d57d61320098 Mon Sep 17 00:00:00 2001
|
|
From: Gary Ching-Pang Lin <glin@suse.com>
|
|
Date: Thu, 21 Feb 2013 17:49:29 +0800
|
|
Subject: [PATCH] Fix the broken bootpath
|
|
|
|
- The file path from DevicePathToStr may use slash as the file
|
|
seperator. Change all slashes to backslashes to avoid the strange
|
|
bootpath.
|
|
- Remove the redundant backslashes.
|
|
- ImagePath no longer requires the leading backslash.
|
|
- Fix a memory leak
|
|
|
|
Based on the patch from Michal Marek <mmarek@suse.com>
|
|
---
|
|
shim.c | 22 +++++++++++++++++-----
|
|
1 file changed, 17 insertions(+), 5 deletions(-)
|
|
|
|
diff --git a/shim.c b/shim.c
|
|
index 94b9710..0622c72 100644
|
|
--- a/shim.c
|
|
+++ b/shim.c
|
|
@@ -981,15 +981,25 @@ static EFI_STATUS generate_path(EFI_LOADED_IMAGE *li, CHAR16 *ImagePath,
|
|
|
|
pathlen = StrLen(bootpath);
|
|
|
|
+ /*
|
|
+ * DevicePathToStr() concatenates two nodes with '/'.
|
|
+ * Convert '/' to '\\'.
|
|
+ */
|
|
+ for (i = 0; i < pathlen; i++) {
|
|
+ if (bootpath[i] == '/')
|
|
+ bootpath[i] = '\\';
|
|
+ }
|
|
for (i=pathlen; i>0; i--) {
|
|
- if (bootpath[i] == '\\')
|
|
+ if (bootpath[i] == '\\' && bootpath[i-1] != '\\')
|
|
break;
|
|
}
|
|
+ if (bootpath[i] == '\\')
|
|
+ bootpath[i+1] = '\0';
|
|
+ else
|
|
+ bootpath[0] = '\0';
|
|
|
|
- bootpath[i+1] = '\0';
|
|
-
|
|
- if (i == 0 || bootpath[i-i] == '\\')
|
|
- bootpath[i] = '\0';
|
|
+ while (*ImagePath == '\\')
|
|
+ ImagePath++;
|
|
|
|
*PathName = AllocatePool(StrSize(bootpath) + StrSize(ImagePath));
|
|
|
|
@@ -1007,6 +1017,8 @@ static EFI_STATUS generate_path(EFI_LOADED_IMAGE *li, CHAR16 *ImagePath,
|
|
*grubpath = FileDevicePath(device, *PathName);
|
|
|
|
error:
|
|
+ FreePool(bootpath);
|
|
+
|
|
return efi_status;
|
|
}
|
|
|
|
--
|
|
1.8.1.4
|
|
|