69 lines
2.4 KiB
Diff
69 lines
2.4 KiB
Diff
|
From f30cd0b6330be8ea72a93bf25e43829c222ba611 Mon Sep 17 00:00:00 2001
|
||
|
|
From: Gary Lin <glin@suse.com>
|
||
|
|
Date: Tue, 26 Feb 2019 11:33:53 +0800
|
||
|
|
Subject: [PATCH] MokManager: Use CompareMem on MokListNode.Type instead of
|
||
|
|
CompareGuid
|
||
|
|
|
||
|
|
Fix the errors from gcc9 '-Werror=address-of-packed-member'
|
||
|
|
|
||
|
|
https://github.com/rhboot/shim/issues/161
|
||
|
|
|
||
|
|
Signed-off-by: Gary Lin <glin@suse.com>
|
||
|
|
---
|
||
|
|
MokManager.c | 14 +++++++++-----
|
||
|
|
1 file changed, 9 insertions(+), 5 deletions(-)
|
||
|
|
|
||
|
|
diff --git a/MokManager.c b/MokManager.c
|
||
|
|
index d69b4dbe..05dc1622 100644
|
||
|
|
--- a/MokManager.c
|
||
|
|
+++ b/MokManager.c
|
||
|
|
@@ -1053,7 +1053,8 @@ static EFI_STATUS write_back_mok_list(MokListNode * list, INTN key_num,
|
||
|
|
continue;
|
||
|
|
|
||
|
|
DataSize += sizeof(EFI_SIGNATURE_LIST);
|
||
|
|
- if (CompareGuid(&(list[i].Type), &X509_GUID) == 0)
|
||
|
|
+ if (CompareMem(&(list[i].Type), &X509_GUID,
|
||
|
|
+ sizeof(EFI_GUID)) == 0)
|
||
|
|
DataSize += sizeof(EFI_GUID);
|
||
|
|
DataSize += list[i].MokSize;
|
||
|
|
}
|
||
|
|
@@ -1075,7 +1076,8 @@ static EFI_STATUS write_back_mok_list(MokListNode * list, INTN key_num,
|
||
|
|
CertList->SignatureType = list[i].Type;
|
||
|
|
CertList->SignatureHeaderSize = 0;
|
||
|
|
|
||
|
|
- if (CompareGuid(&(list[i].Type), &X509_GUID) == 0) {
|
||
|
|
+ if (CompareMem(&(list[i].Type), &X509_GUID,
|
||
|
|
+ sizeof(EFI_GUID)) == 0) {
|
||
|
|
CertList->SignatureListSize = list[i].MokSize +
|
||
|
|
sizeof(EFI_SIGNATURE_LIST) + sizeof(EFI_GUID);
|
||
|
|
CertList->SignatureSize =
|
||
|
|
@@ -1116,7 +1118,8 @@ static void delete_cert(void *key, UINT32 key_size,
|
||
|
|
int i;
|
||
|
|
|
||
|
|
for (i = 0; i < mok_num; i++) {
|
||
|
|
- if (CompareGuid(&(mok[i].Type), &X509_GUID) != 0)
|
||
|
|
+ if (CompareMem(&(mok[i].Type), &X509_GUID,
|
||
|
|
+ sizeof(EFI_GUID)) != 0)
|
||
|
|
continue;
|
||
|
|
|
||
|
|
if (mok[i].MokSize == key_size &&
|
||
|
|
@@ -1167,7 +1170,7 @@ static void delete_hash_in_list(EFI_GUID Type, UINT8 * hash, UINT32 hash_size,
|
||
|
|
sig_size = hash_size + sizeof(EFI_GUID);
|
||
|
|
|
||
|
|
for (i = 0; i < mok_num; i++) {
|
||
|
|
- if ((CompareGuid(&(mok[i].Type), &Type) != 0) ||
|
||
|
|
+ if ((CompareMem(&(mok[i].Type), &Type, sizeof(EFI_GUID)) != 0) ||
|
||
|
|
(mok[i].MokSize < sig_size))
|
||
|
|
continue;
|
||
|
|
|
||
|
|
@@ -1331,7 +1334,8 @@ static EFI_STATUS delete_keys(void *MokDel, UINTN MokDelSize, BOOLEAN MokX)
|
||
|
|
|
||
|
|
/* Search and destroy */
|
||
|
|
for (i = 0; i < del_num; i++) {
|
||
|
|
- if (CompareGuid(&(del_key[i].Type), &X509_GUID) == 0) {
|
||
|
|
+ if (CompareMem(&(del_key[i].Type), &X509_GUID,
|
||
|
|
+ sizeof(EFI_GUID)) == 0) {
|
||
|
|
delete_cert(del_key[i].Mok, del_key[i].MokSize,
|
||
|
|
mok, mok_num);
|
||
|
|
} else if (is_sha2_hash(del_key[i].Type)) {
|