SecurityPkg/HddPassword: Use BaseLib linked list iteration macros

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.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>
Reviewed-by: Liming Gao <liming.gao@intel.com>
Reviewed-by: Bret Barkelew <bret.barkelew@microsoft.com>

diff --git a/SecurityPkg/HddPassword/HddPasswordDxe.c b/SecurityPkg/HddPassword/HddPasswordDxe.c
index a25b3471d073449e6bb99d753be80c412c7355b6..32b55a6a8b7249a2698d935d7803964a0718bd14 100644 (file)
--- 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.\r
 \r
   Copyright (c) 2019, Intel Corporation. All rights reserved.<BR>\r
+  Copyright (c) Microsoft Corporation.<BR>\r
 \r
   SPDX-License-Identifier: BSD-2-Clause-Patent\r
 \r
@@ -115,7 +116,7 @@ BuildHddPasswordDeviceInfo (
   // Build HDD password device info and save them to LockBox.\r
   //\r
   DevInfoLength = 0;\r
-  EFI_LIST_FOR_EACH (Entry, &mHddPasswordConfigFormList) {\r
+  BASE_LIST_FOR_EACH (Entry, &mHddPasswordConfigFormList) {\r
     ConfigFormEntry = BASE_CR (Entry, HDD_PASSWORD_CONFIG_FORM_ENTRY, Link);\r
 \r
     //\r
@@ -164,7 +165,7 @@ BuildHddPasswordDeviceInfo (
   ASSERT (DevInfo != NULL);\r
 \r
   TempDevInfo = DevInfo;\r
-  EFI_LIST_FOR_EACH (Entry, &mHddPasswordConfigFormList) {\r
+  BASE_LIST_FOR_EACH (Entry, &mHddPasswordConfigFormList) {\r
     ConfigFormEntry = BASE_CR (Entry, HDD_PASSWORD_CONFIG_FORM_ENTRY, Link);\r
 \r
     if ((!PasswordIsFullZero (ConfigFormEntry->Password)) ||\r
@@ -472,7 +473,7 @@ HddPasswordEndOfDxeEventNotify (
   //\r
   // Zero passsword and freeze lock device.\r
   //\r
-  EFI_LIST_FOR_EACH (Entry, &mHddPasswordConfigFormList) {\r
+  BASE_LIST_FOR_EACH (Entry, &mHddPasswordConfigFormList) {\r
     ConfigFormEntry = BASE_CR (Entry, HDD_PASSWORD_CONFIG_FORM_ENTRY, Link);\r
 \r
     ZeroMem (ConfigFormEntry->Password, HDD_PASSWORD_MAX_LENGTH);\r
@@ -2026,7 +2027,7 @@ HddPasswordGetConfigFormEntryByIndex (
   CurrentIndex    = 0;\r
   ConfigFormEntry = NULL;\r
 \r
-  EFI_LIST_FOR_EACH (Entry, &mHddPasswordConfigFormList) {\r
+  BASE_LIST_FOR_EACH (Entry, &mHddPasswordConfigFormList) {\r
     if (CurrentIndex == Index) {\r
       ConfigFormEntry = BASE_CR (Entry, HDD_PASSWORD_CONFIG_FORM_ENTRY, Link);\r
       break;\r
@@ -2408,7 +2409,7 @@ HddPasswordConfigUpdateForm (
   ConfigFormEntry = NULL;\r
   EntryExisted    = FALSE;\r
 \r
-  EFI_LIST_FOR_EACH (Entry, &mHddPasswordConfigFormList) {\r
+  BASE_LIST_FOR_EACH (Entry, &mHddPasswordConfigFormList) {\r
     ConfigFormEntry = BASE_CR (Entry, HDD_PASSWORD_CONFIG_FORM_ENTRY, Link);\r
 \r
     if ((ConfigFormEntry->Bus == Bus) &&\r
@@ -2503,7 +2504,7 @@ HddPasswordConfigUpdateForm (
     EndLabel->Number       = HDD_DEVICE_LABEL_END;\r
 \r
     mNumberOfHddDevices = 0;\r
-    EFI_LIST_FOR_EACH (Entry, &mHddPasswordConfigFormList) {\r
+    BASE_LIST_FOR_EACH (Entry, &mHddPasswordConfigFormList) {\r
       ConfigFormEntry = BASE_CR (Entry, HDD_PASSWORD_CONFIG_FORM_ENTRY, Link);\r
 \r
       HiiCreateGotoOpCode (\r

diff --git a/SecurityPkg/HddPassword/HddPasswordDxe.h b/SecurityPkg/HddPassword/HddPasswordDxe.h
index 87db587eb6f0439c4a8630132018b7e78826051d..a6c87169dc5925664386421bfd141a67de5b6005 100644 (file)
--- a/SecurityPkg/HddPassword/HddPasswordDxe.h
+++ b/SecurityPkg/HddPassword/HddPasswordDxe.h
@@ -1,6 +1,7 @@
 /** @file\r
 \r
   Copyright (c) 2019, Intel Corporation. All rights reserved.<BR>\r
+  Copyright (c) Microsoft Corporation.<BR>\r
 \r
   SPDX-License-Identifier: BSD-2-Clause-Patent\r
 \r
@@ -87,12 +88,6 @@ typedef struct _HDD_PASSWORD_DXE_PRIVATE_DATA {
 \r
 #define HDD_PASSWORD_DXE_PRIVATE_FROM_THIS(a)  CR (a, HDD_PASSWORD_DXE_PRIVATE_DATA, ConfigAccess, HDD_PASSWORD_DXE_PRIVATE_SIGNATURE)\r
 \r
-//\r
-//Iterate through the double linked list. NOT delete safe\r
-//\r
-#define EFI_LIST_FOR_EACH(Entry, ListHead)    \\r
-  for (Entry = (ListHead)->ForwardLink; Entry != (ListHead); Entry = Entry->ForwardLink)\r
-\r
 #define PASSWORD_SALT_SIZE                  32\r
 \r
 #define HDD_PASSWORD_REQUEST_VARIABLE_NAME  L"HddPasswordRequest"\r