From 943b332a3848511e1f31d3e48d3108f410854f20 Mon Sep 17 00:00:00 2001 From: lei_ju Date: Mon, 22 Jun 2020 17:49:19 +0800 Subject: [PATCH] fix unaligned point value with GCC9 Follow those steps: osc build and occurs error:taking address of packed member of 'struct ' may result in an unaligned point value [-Werror=address-of-packed-member] This is because warning [-Werror=address-of-packed-member] is dealing with error in gcc9 Fix MokManager.c code to deal with this issue Signed-off-by: lei_ju --- MokManager.c | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/MokManager.c b/MokManager.c index 7e40a38..16efabd 100644 --- a/MokManager.c +++ b/MokManager.c @@ -1078,7 +1078,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; } @@ -1100,7 +1101,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 = @@ -1141,7 +1143,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 && @@ -1192,7 +1195,8 @@ 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; @@ -1356,7 +1360,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)) { -- 2.23.0