Reviewed-by: jiewen....@intel.com > -----Original Message----- > From: michael.kuba...@outlook.com <michael.kuba...@outlook.com> > Sent: Friday, April 10, 2020 4:05 AM > To: devel@edk2.groups.io > Cc: Zhang, Chao B <chao.b.zh...@intel.com>; Wu, Hao A > <hao.a...@intel.com>; Wang, Jian J <jian.j.w...@intel.com>; Yao, Jiewen > <jiewen....@intel.com>; Sean Brogan <sean.bro...@microsoft.com> > Subject: [PATCH v1 7/7] SecurityPkg/HddPassword: Use BaseLib linked list > iteration macros > > From: Michael Kubacki <michael.kuba...@microsoft.com> > > REF:https://bugzilla.tianocore.org/show_bug.cgi?id=1959 > > Replaces usage of the linked list iteration macros defined in > HddPasswordDxe.h with the common definition in BaseLib.h. > > Cc: Chao Zhang <chao.b.zh...@intel.com> > Cc: Hao A Wu <hao.a...@intel.com> > Cc: Jian J Wang <jian.j.w...@intel.com> > Cc: Jiewen Yao <jiewen....@intel.com> > Cc: Sean Brogan <sean.bro...@microsoft.com> > Signed-off-by: Michael Kubacki <michael.kuba...@microsoft.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.<BR> > + Copyright (c) Microsoft Corporation.<BR> > > 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.<BR> > + Copyright (c) Microsoft Corporation.<BR> > > 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
-=-=-=-=-=-=-=-=-=-=-=- Groups.io Links: You receive all messages sent to this group. View/Reply Online (#57162): https://edk2.groups.io/g/devel/message/57162 Mute This Topic: https://groups.io/mt/72905948/21656 Group Owner: devel+ow...@edk2.groups.io Unsubscribe: https://edk2.groups.io/g/devel/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
