104 lines
4.4 KiB
Diff
104 lines
4.4 KiB
Diff
|
From 7f364d9a95905efee0a8b46e4108042aaebe7849 Mon Sep 17 00:00:00 2001
|
||
|
|
From: Laszlo Ersek <lersek@redhat.com>
|
||
|
|
Date: Fri, 31 Jan 2020 12:42:37 +0100
|
||
|
|
Subject: [PATCH 01/12] SecurityPkg: Fix spelling errors [PARTIAL PICK]
|
||
|
|
MIME-Version: 1.0
|
||
|
|
Content-Type: text/plain; charset=UTF-8
|
||
|
|
Content-Transfer-Encoding: 8bit
|
||
|
|
|
||
|
|
RH-Author: Laszlo Ersek <lersek@redhat.com>
|
||
|
|
Message-id: <20200131124248.22369-2-lersek@redhat.com>
|
||
|
|
Patchwork-id: 93612
|
||
|
|
O-Subject: [RHEL-8.2.0 edk2 PATCH 01/12] SecurityPkg: Fix spelling errors [PARTIAL PICK]
|
||
|
|
Bugzilla: 1751993
|
||
|
|
RH-Acked-by: Philippe Mathieu-Daudé <philmd@redhat.com>
|
||
|
|
RH-Acked-by: Vitaly Kuznetsov <vkuznets@redhat.com>
|
||
|
|
|
||
|
|
From: Sean Brogan <sean.brogan@microsoft.com>
|
||
|
|
|
||
|
|
--v-- RHEL-8 note start --v--
|
||
|
|
|
||
|
|
This is a partial cherry-pick, restricted to
|
||
|
|
"SecurityPkg/Library/DxeImageVerificationLib/DxeImageVerificationLib.c".
|
||
|
|
|
||
|
|
The upstream patch has a super-ugly diffstat (81 files changed, 205
|
||
|
|
insertions(+), 205 deletions(-)), fixing spelling errors all over
|
||
|
|
SecurityPkg in one go. It doesn't apply cleanly down-stream, and I don't
|
||
|
|
want to pick more (unrelated) SecurityPkg dependencies for this backport
|
||
|
|
series.
|
||
|
|
|
||
|
|
Thus, the only alternative to this partial cherry-pick would be resolving
|
||
|
|
conflicts over the rest of this series. That's obviously worse than a
|
||
|
|
partial typo fix backport. At the next rebase, we're going to drop this
|
||
|
|
patch and the rest of the backport series alike, anyway.
|
||
|
|
|
||
|
|
--^-- RHEL-8 note end --^--
|
||
|
|
|
||
|
|
https://bugzilla.tianocore.org/show_bug.cgi?id=2265
|
||
|
|
|
||
|
|
Cc: Jiewen Yao <jiewen.yao@intel.com>
|
||
|
|
Cc: Jian J Wang <jian.j.wang@intel.com>
|
||
|
|
Cc: Chao Zhang <chao.b.zhang@intel.com>
|
||
|
|
Signed-off-by: Michael D Kinney <michael.d.kinney@intel.com>
|
||
|
|
Reviewed-by: Jiewen Yao <Jiewen.yao@intel.com>
|
||
|
|
Reviewed-by: Jian J Wang <jian.j.wang@intel.com>
|
||
|
|
(cherry picked from commit d6b926e76e3d639ac37610e97d33ff9e3a6281eb)
|
||
|
|
Signed-off-by: Laszlo Ersek <lersek@redhat.com>
|
||
|
|
Signed-off-by: Miroslav Rezanina <mrezanin@redhat.com>
|
||
|
|
---
|
||
|
|
.../Library/DxeImageVerificationLib/DxeImageVerificationLib.c | 10 +++++-----
|
||
|
|
1 file changed, 5 insertions(+), 5 deletions(-)
|
||
|
|
|
||
|
|
diff --git a/SecurityPkg/Library/DxeImageVerificationLib/DxeImageVerificationLib.c b/SecurityPkg/Library/DxeImageVerificationLib/DxeImageVerificationLib.c
|
||
|
|
index fe4cdcc..a0a12b5 100644
|
||
|
|
--- a/SecurityPkg/Library/DxeImageVerificationLib/DxeImageVerificationLib.c
|
||
|
|
+++ b/SecurityPkg/Library/DxeImageVerificationLib/DxeImageVerificationLib.c
|
||
|
|
@@ -745,7 +745,7 @@ AddImageExeInfo (
|
||
|
|
if (ImageExeInfoTable != NULL) {
|
||
|
|
//
|
||
|
|
// The table has been found!
|
||
|
|
- // We must enlarge the table to accomodate the new exe info entry.
|
||
|
|
+ // We must enlarge the table to accommodate the new exe info entry.
|
||
|
|
//
|
||
|
|
ImageExeInfoTableSize = GetImageExeInfoTableSize (ImageExeInfoTable);
|
||
|
|
} else {
|
||
|
|
@@ -947,7 +947,7 @@ Done:
|
||
|
|
|
||
|
|
@param[in] VariableName Name of database variable that is searched in.
|
||
|
|
@param[in] Signature Pointer to signature that is searched for.
|
||
|
|
- @param[in] CertType Pointer to hash algrithom.
|
||
|
|
+ @param[in] CertType Pointer to hash algorithm.
|
||
|
|
@param[in] SignatureSize Size of Signature.
|
||
|
|
|
||
|
|
@return TRUE Found the signature in the variable database.
|
||
|
|
@@ -992,7 +992,7 @@ IsSignatureFoundInDatabase (
|
||
|
|
goto Done;
|
||
|
|
}
|
||
|
|
//
|
||
|
|
- // Enumerate all signature data in SigDB to check if executable's signature exists.
|
||
|
|
+ // Enumerate all signature data in SigDB to check if signature exists for executable.
|
||
|
|
//
|
||
|
|
CertList = (EFI_SIGNATURE_LIST *) Data;
|
||
|
|
while ((DataSize > 0) && (DataSize >= CertList->SignatureListSize)) {
|
||
|
|
@@ -1844,7 +1844,7 @@ DxeImageVerificationHandler (
|
||
|
|
|
||
|
|
if (OffSet != (SecDataDir->VirtualAddress + SecDataDir->Size)) {
|
||
|
|
//
|
||
|
|
- // The Size in Certificate Table or the attribute certicate table is corrupted.
|
||
|
|
+ // The Size in Certificate Table or the attribute certificate table is corrupted.
|
||
|
|
//
|
||
|
|
VerifyStatus = EFI_ACCESS_DENIED;
|
||
|
|
}
|
||
|
|
@@ -1855,7 +1855,7 @@ DxeImageVerificationHandler (
|
||
|
|
Status = EFI_ACCESS_DENIED;
|
||
|
|
if (Action == EFI_IMAGE_EXECUTION_AUTH_SIG_FAILED || Action == EFI_IMAGE_EXECUTION_AUTH_SIG_FOUND) {
|
||
|
|
//
|
||
|
|
- // Get image hash value as executable's signature.
|
||
|
|
+ // Get image hash value as signature of executable.
|
||
|
|
//
|
||
|
|
SignatureListSize = sizeof (EFI_SIGNATURE_LIST) + sizeof (EFI_SIGNATURE_DATA) - 1 + mImageDigestSize;
|
||
|
|
SignatureList = (EFI_SIGNATURE_LIST *) AllocateZeroPool (SignatureListSize);
|
||
|
|
--
|
||
|
|
1.8.3.1
|
||
|
|
|