<html xmlns:o="urn:schemas-microsoft-com:office:office" xmlns:w="urn:schemas-microsoft-com:office:word" xmlns:m="http://schemas.microsoft.com/office/2004/12/omml" xmlns="http://www.w3.org/TR/REC-html40"> <head> <meta http-equiv="Content-Type" content="text/html; charset=us-ascii"> <meta name="Generator" content="Microsoft Word 15 (filtered medium)"> <style></style> </head> <body lang="EN-US" link="blue" vlink="#954F72"> <div class="WordSection1"> Reviewed-by: Bret Barkelew <bret.barkelew@microsoft.com> <o:p> </o:p> - Bret <o:p> </o:p> </div> <hr style="display:inline-block;width:98%" tabindex="-1"> <div id="divRplyFwdMsg" dir="ltr">From: devel@edk2.groups.io <devel@edk2.groups.io> on behalf of Michael Kubacki via groups.io <michael.kubacki=outlook.com@groups.io> Sent: Friday, April 10, 2020 1:02:18 PM To: devel@edk2.groups.io <devel@edk2.groups.io> Cc: Chao Zhang <chao.b.zhang@intel.com>; Hao A Wu <hao.a.wu@intel.com>; Jian J Wang <jian.j.wang@intel.com>; Jiewen Yao <jiewen.yao@intel.com>; Sean Brogan <sean.brogan@microsoft.com> Subject: [EXTERNAL] [edk2-devel] [PATCH v2 7/7] SecurityPkg/HddPassword: Use BaseLib linked list iteration macros <div> </div> </div> <div class="BodyFragment"> <div class="PlainText">From: Michael Kubacki <michael.kubacki@microsoft.com> REF:https://nam06.safelinks.protection.outlook.com/?url=https%3A%2F%2Fbugzilla.tianocore.org%2Fshow_bug.cgi%3Fid%3D1959&data=02%7C01%7CBret.Barkelew%40microsoft.com%7C0cb7a3e5e3ef4f9c776808d7dd8a2c7e%7C72f988bf86f141af91ab2d7cd011db47%7C1%7C0%7C637221457829007406&sdata=TzvNo4r7FXEx%2BLEifMTR8HHL%2BGGpl8WkOiABJS1IqF8%3D&reserved=0 Replaces usage of the linked list iteration macros defined in HddPasswordDxe.h with the common definition in BaseLib.h. Cc: Chao Zhang <chao.b.zhang@intel.com> Cc: Hao A Wu <hao.a.wu@intel.com> Cc: Jian J Wang <jian.j.wang@intel.com> Cc: Jiewen Yao <jiewen.yao@intel.com> Cc: Sean Brogan <sean.brogan@microsoft.com> Signed-off-by: Michael Kubacki <michael.kubacki@microsoft.com> Reviewed-by: Jiewen Yao <jiewen.yao@intel.com> --- SecurityPkg/HddPassword/HddPasswordDxe.c | 13 +++++++------ SecurityPkg/HddPassword/HddPasswordDxe.h | 7 +------ 2 files changed, 8 insertions(+), 12 deletions(-) diff --git a/SecurityPkg/HddPassword/HddPasswordDxe.c b/SecurityPkg/HddPassword/HddPasswordDxe.c index a25b3471d073..32b55a6a8b72 100644 --- a/SecurityPkg/HddPassword/HddPasswordDxe.c +++ b/SecurityPkg/HddPassword/HddPasswordDxe.c @@ -2,6 +2,7 @@ HDD password driver which is used to support HDD security feature. Copyright (c) 2019, Intel Corporation. All rights reserved. + Copyright (c) Microsoft Corporation. SPDX-License-Identifier: BSD-2-Clause-Patent @@ -115,7 +116,7 @@ BuildHddPasswordDeviceInfo ( // Build HDD password device info and save them to LockBox. // DevInfoLength = 0; - EFI_LIST_FOR_EACH (Entry, &mHddPasswordConfigFormList) { + BASE_LIST_FOR_EACH (Entry, &mHddPasswordConfigFormList) { ConfigFormEntry = BASE_CR (Entry, HDD_PASSWORD_CONFIG_FORM_ENTRY, Link); // @@ -164,7 +165,7 @@ BuildHddPasswordDeviceInfo ( ASSERT (DevInfo != NULL); TempDevInfo = DevInfo; - EFI_LIST_FOR_EACH (Entry, &mHddPasswordConfigFormList) { + BASE_LIST_FOR_EACH (Entry, &mHddPasswordConfigFormList) { ConfigFormEntry = BASE_CR (Entry, HDD_PASSWORD_CONFIG_FORM_ENTRY, Link); if ((!PasswordIsFullZero (ConfigFormEntry->Password)) || @@ -472,7 +473,7 @@ HddPasswordEndOfDxeEventNotify ( // // Zero passsword and freeze lock device. // - EFI_LIST_FOR_EACH (Entry, &mHddPasswordConfigFormList) { + BASE_LIST_FOR_EACH (Entry, &mHddPasswordConfigFormList) { ConfigFormEntry = BASE_CR (Entry, HDD_PASSWORD_CONFIG_FORM_ENTRY, Link); ZeroMem (ConfigFormEntry->Password, HDD_PASSWORD_MAX_LENGTH); @@ -2026,7 +2027,7 @@ HddPasswordGetConfigFormEntryByIndex ( CurrentIndex = 0; ConfigFormEntry = NULL; - EFI_LIST_FOR_EACH (Entry, &mHddPasswordConfigFormList) { + BASE_LIST_FOR_EACH (Entry, &mHddPasswordConfigFormList) { if (CurrentIndex == Index) { ConfigFormEntry = BASE_CR (Entry, HDD_PASSWORD_CONFIG_FORM_ENTRY, Link); break; @@ -2408,7 +2409,7 @@ HddPasswordConfigUpdateForm ( ConfigFormEntry = NULL; EntryExisted = FALSE; - EFI_LIST_FOR_EACH (Entry, &mHddPasswordConfigFormList) { + BASE_LIST_FOR_EACH (Entry, &mHddPasswordConfigFormList) { ConfigFormEntry = BASE_CR (Entry, HDD_PASSWORD_CONFIG_FORM_ENTRY, Link); if ((ConfigFormEntry->Bus == Bus) && @@ -2503,7 +2504,7 @@ HddPasswordConfigUpdateForm ( EndLabel->Number = HDD_DEVICE_LABEL_END; mNumberOfHddDevices = 0; - EFI_LIST_FOR_EACH (Entry, &mHddPasswordConfigFormList) { + BASE_LIST_FOR_EACH (Entry, &mHddPasswordConfigFormList) { ConfigFormEntry = BASE_CR (Entry, HDD_PASSWORD_CONFIG_FORM_ENTRY, Link); HiiCreateGotoOpCode ( diff --git a/SecurityPkg/HddPassword/HddPasswordDxe.h b/SecurityPkg/HddPassword/HddPasswordDxe.h index 87db587eb6f0..a6c87169dc59 100644 --- a/SecurityPkg/HddPassword/HddPasswordDxe.h +++ b/SecurityPkg/HddPassword/HddPasswordDxe.h @@ -1,6 +1,7 @@ /** @file Copyright (c) 2019, Intel Corporation. All rights reserved. + Copyright (c) Microsoft Corporation. SPDX-License-Identifier: BSD-2-Clause-Patent @@ -87,12 +88,6 @@ typedef struct _HDD_PASSWORD_DXE_PRIVATE_DATA { #define HDD_PASSWORD_DXE_PRIVATE_FROM_THIS(a) CR (a, HDD_PASSWORD_DXE_PRIVATE_DATA, ConfigAccess, HDD_PASSWORD_DXE_PRIVATE_SIGNATURE) -// -//Iterate through the double linked list. NOT delete safe -// -#define EFI_LIST_FOR_EACH(Entry, ListHead) \ - for (Entry = (ListHead)->ForwardLink; Entry != (ListHead); Entry = Entry->ForwardLink) - #define PASSWORD_SALT_SIZE 32 #define HDD_PASSWORD_REQUEST_VARIABLE_NAME L"HddPasswordRequest" -- 2.16.3.windows.1 </div> </div> </body> </html> <div width="1" style="color:white;clear:both">_._,_._,_</div> <hr> Groups.io Links: You receive all messages sent to this group. <a target="_blank" href="https://edk2.groups.io/g/devel/message/57244">View/Reply Online (#57244)</a> | | <a target="_blank" href="https://groups.io/mt/72934424/1813853">Mute This Topic</a> | <a href="https://edk2.groups.io/g/devel/post">New Topic</a> <a href="https://edk2.groups.io/g/devel/editsub/1813853">Your Subscription</a> | <a href="mailto:devel+owner@edk2.groups.io">Contact Group Owner</a> | <a href="https://edk2.groups.io/g/devel/unsub">Unsubscribe</a> [edk2-devel-archive@redhat.com] <div width="1" style="color:white;clear:both">_._,_._,_</div>