|
 |
00e791 |
From 5d30a31fef4eb7e773da24c5e6c20576282a9c3a Mon Sep 17 00:00:00 2001
|
|
|
00e791 |
From: Gary Lin <glin@suse.com>
|
|
|
00e791 |
Date: Tue, 26 Feb 2019 11:33:53 +0800
|
|
|
00e791 |
Subject: [PATCH 34/62] MokManager: Use CompareMem on MokListNode.Type instead
|
|
|
00e791 |
of CompareGuid
|
|
|
00e791 |
|
|
|
00e791 |
Fix the errors from gcc9 '-Werror=address-of-packed-member'
|
|
|
00e791 |
|
|
|
00e791 |
https://github.com/rhboot/shim/issues/161
|
|
|
00e791 |
|
|
|
00e791 |
Signed-off-by: Gary Lin <glin@suse.com>
|
|
|
00e791 |
Upstream-commit-id: aaa09b35e73
|
|
|
00e791 |
---
|
|
|
00e791 |
MokManager.c | 14 +++++++++-----
|
|
|
00e791 |
1 file changed, 9 insertions(+), 5 deletions(-)
|
|
|
00e791 |
|
|
|
00e791 |
diff --git a/MokManager.c b/MokManager.c
|
|
|
00e791 |
index a1bd39a68e2..30192c16789 100644
|
|
|
00e791 |
--- a/MokManager.c
|
|
|
00e791 |
+++ b/MokManager.c
|
|
|
00e791 |
@@ -1079,7 +1079,8 @@ static EFI_STATUS write_back_mok_list(MokListNode * list, INTN key_num,
|
|
|
00e791 |
continue;
|
|
|
00e791 |
|
|
|
00e791 |
DataSize += sizeof(EFI_SIGNATURE_LIST);
|
|
|
00e791 |
- if (CompareMemberGuid(&(list[i].Type), &X509_GUID) == 0)
|
|
|
00e791 |
+ if (CompareMem(&(list[i].Type), &X509_GUID,
|
|
|
00e791 |
+ sizeof(EFI_GUID)) == 0)
|
|
|
00e791 |
DataSize += sizeof(EFI_GUID);
|
|
|
00e791 |
DataSize += list[i].MokSize;
|
|
|
00e791 |
}
|
|
|
00e791 |
@@ -1101,7 +1102,8 @@ static EFI_STATUS write_back_mok_list(MokListNode * list, INTN key_num,
|
|
|
00e791 |
CertList->SignatureType = list[i].Type;
|
|
|
00e791 |
CertList->SignatureHeaderSize = 0;
|
|
|
00e791 |
|
|
|
00e791 |
- if (CompareMemberGuid(&(list[i].Type), &X509_GUID) == 0) {
|
|
|
00e791 |
+ if (CompareMem(&(list[i].Type), &X509_GUID,
|
|
|
00e791 |
+ sizeof(EFI_GUID)) == 0) {
|
|
|
00e791 |
CertList->SignatureListSize = list[i].MokSize +
|
|
|
00e791 |
sizeof(EFI_SIGNATURE_LIST) + sizeof(EFI_GUID);
|
|
|
00e791 |
CertList->SignatureSize =
|
|
|
00e791 |
@@ -1142,7 +1144,8 @@ static void delete_cert(void *key, UINT32 key_size,
|
|
|
00e791 |
int i;
|
|
|
00e791 |
|
|
|
00e791 |
for (i = 0; i < mok_num; i++) {
|
|
|
00e791 |
- if (CompareMemberGuid(&(mok[i].Type), &X509_GUID) != 0)
|
|
|
00e791 |
+ if (CompareMem(&(mok[i].Type), &X509_GUID,
|
|
|
00e791 |
+ sizeof(EFI_GUID)) != 0)
|
|
|
00e791 |
continue;
|
|
|
00e791 |
|
|
|
00e791 |
if (mok[i].MokSize == key_size &&
|
|
|
00e791 |
@@ -1193,7 +1196,7 @@ static void delete_hash_in_list(EFI_GUID Type, UINT8 * hash, UINT32 hash_size,
|
|
|
00e791 |
sig_size = hash_size + sizeof(EFI_GUID);
|
|
|
00e791 |
|
|
|
00e791 |
for (i = 0; i < mok_num; i++) {
|
|
|
00e791 |
- if ((CompareMemberGuid(&(mok[i].Type), &Type) != 0) ||
|
|
|
00e791 |
+ if ((CompareMem(&(mok[i].Type), &Type, sizeof(EFI_GUID)) != 0) ||
|
|
|
00e791 |
(mok[i].MokSize < sig_size))
|
|
|
00e791 |
continue;
|
|
|
00e791 |
|
|
|
00e791 |
@@ -1357,7 +1360,8 @@ static EFI_STATUS delete_keys(void *MokDel, UINTN MokDelSize, BOOLEAN MokX)
|
|
|
00e791 |
|
|
|
00e791 |
/* Search and destroy */
|
|
|
00e791 |
for (i = 0; i < del_num; i++) {
|
|
|
00e791 |
- if (CompareMemberGuid(&(del_key[i].Type), &X509_GUID) == 0) {
|
|
|
00e791 |
+ if (CompareMem(&(del_key[i].Type), &X509_GUID,
|
|
|
00e791 |
+ sizeof(EFI_GUID)) == 0) {
|
|
|
00e791 |
delete_cert(del_key[i].Mok, del_key[i].MokSize,
|
|
|
00e791 |
mok, mok_num);
|
|
|
00e791 |
} else if (is_sha2_hash(del_key[i].Type)) {
|
|
|
00e791 |
--
|
|
|
00e791 |
2.26.2
|
|
|
00e791 |
|