From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from NAM12-MW2-obe.outbound.protection.outlook.com (NAM12-MW2-obe.outbound.protection.outlook.com [40.92.23.56]) by mx.groups.io with SMTP id smtpd.web12.4897.1586548980395736227 for ; Fri, 10 Apr 2020 13:03:00 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@outlook.com header.s=selector1 header.b=D7ITI59N; spf=pass (domain: outlook.com, ip: 40.92.23.56, mailfrom: michael.kubacki@outlook.com) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=G5TCDG38pKmeRPru5uLRLR8OlpwcFXkJgaCqMAvzhVec234d12K95PUIT7mZaEE/oNun3Eczk1z5Kt0zmp13mmtLtOZaZ9JQYUNgqa4dQc/s9x/HGRObwppu2mDFcOhCYOyn4EDTX4ma6NxvQsmUiWPEgyChqd0oGdQZjtPzU85WCww0mL/w6AtOMNnifRZ3NWcJYQm5eof8O1nG05Gh1K9DNhzV5jw/BwmoHZJCeQ1F/EDy4T2ZBSxFEjGTAvBMzd1LYYBxQJX4RZVRt6dFQxciVnRf3l9zwOnm4c4z/EANmeed05KtMI4pyb+xd0njCyHnUpxm/KCuVOHEBjNsxA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=4e3dFTbyk8HuJxahlqXvXhyP6kge72aUBLBa4W/s1Ko=; b=m1UyB9tjVsPFeYOj06A9T6cpgUfg9kVQFOIwVTNjjoDjCkpUXQ9aa72ld410TMUxvU/FRkevOOWiR8XItSX+7qZL6J3P41wkygYR41J8fgZda2deais07ytxy7mH/JmQGTEZxNed+tuq/k32sYHgIox0j+OZW7kcLr3t2q8C2BZeWHQs4flITB9/JKtt3UaI8Crl1da2v44/slXbPagNakr4n60woIjsj7/Y+SX4LE9OS8rZ0QMYI3cjr9JOFzUE1Ppuccm5x9bwe09NilApKiJjBTJJ0KTq2kLe28FBQ6/H9iMmgdZ15saXVu2zHA4/HZOn0kQX5y5M0yen+d54wg== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=outlook.com; dmarc=pass action=none header.from=outlook.com; dkim=pass header.d=outlook.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=outlook.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=4e3dFTbyk8HuJxahlqXvXhyP6kge72aUBLBa4W/s1Ko=; b=D7ITI59NO8voekl24+O2+/H6s7RduisZYX+D5ZbbB78+REzzLHUYE2A1xftTApZNGWVp8/MugbDqHO9dLvUfgW8Dhu0oRGIC9jDyXpGp8IpxK5hhwPx58OuZ1bGeQXFjvegJAiaVhFPkQ3ApIMwbyUPt+c7USRDisUa65bVxeXFPbGYWdF84dWl86yERPtrsjRyOtqT2227QyWPMCONweXB4tMZzuTBvga/5icXY3x/aQ5eWPnw66HmYKaT2OnWB+8HjSGNh41PbBvCPyoBXVubQlqeWginvy6cJwV6JaEyby1hU1MKv7wQFqQyCpVt1zBiok2qXBrg/dIvI5DrymQ== Received: from MW2NAM12FT048.eop-nam12.prod.protection.outlook.com (2a01:111:e400:fc65::49) by MW2NAM12HT064.eop-nam12.prod.protection.outlook.com (2a01:111:e400:fc65::132) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.2921.12; Fri, 10 Apr 2020 20:02:59 +0000 Received: from MWHPR07MB3440.namprd07.prod.outlook.com (2a01:111:e400:fc65::48) by MW2NAM12FT048.mail.protection.outlook.com (2a01:111:e400:fc65::215) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.2921.12 via Frontend Transport; Fri, 10 Apr 2020 20:02:59 +0000 X-IncomingTopHeaderMarker: OriginalChecksum:95184FCEA1441BB76B166EBF2FED754F7244953E5D3602350D86B34018C5D3A9;UpperCasedChecksum:A56616FB0F90C52C37FE4878D592A59DE4CFA9762FFF89E5544A096178CC6A95;SizeAsReceived:7871;Count:49 Received: from MWHPR07MB3440.namprd07.prod.outlook.com ([fe80::bcc9:271b:20db:52e3]) by MWHPR07MB3440.namprd07.prod.outlook.com ([fe80::bcc9:271b:20db:52e3%6]) with mapi id 15.20.2900.015; Fri, 10 Apr 2020 20:02:59 +0000 From: "Michael Kubacki" To: devel@edk2.groups.io Cc: Chao Zhang , Hao A Wu , Jian J Wang , Jiewen Yao , Sean Brogan Subject: [PATCH v2 7/7] SecurityPkg/HddPassword: Use BaseLib linked list iteration macros Date: Fri, 10 Apr 2020 13:02:18 -0700 Message-ID: X-Mailer: git-send-email 2.16.3.windows.1 In-Reply-To: <20200410200218.24992-1-michael.kubacki@outlook.com> References: <20200410200218.24992-1-michael.kubacki@outlook.com> X-ClientProxiedBy: MWHPR01CA0033.prod.exchangelabs.com (2603:10b6:300:101::19) To MWHPR07MB3440.namprd07.prod.outlook.com (2603:10b6:301:69::28) Return-Path: michael.kubacki@outlook.com X-Microsoft-Original-Message-ID: <20200410200218.24992-8-michael.kubacki@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from localhost.localdomain (2001:4898:80e8:1:71cb:63a2:e2d4:2255) by MWHPR01CA0033.prod.exchangelabs.com (2603:10b6:300:101::19) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.2900.15 via Frontend Transport; Fri, 10 Apr 2020 20:02:58 +0000 X-Mailer: git-send-email 2.16.3.windows.1 X-Microsoft-Original-Message-ID: <20200410200218.24992-8-michael.kubacki@outlook.com> X-TMN: [7Zw/FCv70N+o7SzJOY2LQyldqQ5TbSuP/3P36dfNRTU3Abn4SxsiIaFY/gTzbkSN] X-MS-PublicTrafficType: Email X-IncomingHeaderCount: 49 X-EOPAttributedMessage: 0 X-MS-Office365-Filtering-Correlation-Id: bd44e8b5-5260-4e89-00ed-08d7dd8a2ad4 X-MS-TrafficTypeDiagnostic: MW2NAM12HT064: X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: ZCqzwr7X6M+VsSxUjOqCXUNvZQi7fnHhNOYNUQqmMMPWJNesKzkmD4a9nJkGz1JrCt55wsAnfbUFcZB+Lafvv30U29PPpsJlkd0cDA4A0/axQZMxtsrvpFBhQ75r/1/jL34QsrIyFGWvMpTLDopd8RUayHeGdjvJuleHg9+tRzBcYYThILf7dhMcqSHYpsrlhqxbft2ELymsq2T8mYU8EtTJEpR+mnvOvD9RJnjwcss= X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:0;SRV:;IPV:NLI;SFV:NSPM;H:MWHPR07MB3440.namprd07.prod.outlook.com;PTR:;CAT:NONE;SFTY:;SFS:;DIR:OUT;SFP:1901; X-MS-Exchange-AntiSpam-MessageData: D5CtiUlXKL/M6kS3B+rzaFbTUYeR78ndwkPf6lp03QWSFo7Y0dDuAap5BhlsrlQo+oA3uB1wjKVDSXU7AnAlRSdf4VjYKseVefUF8x8aF18//td+Azb+1aeErYxc2N/XvROU3elrqomLLdWvOmONlTH81ADSMaePKy/2+lI6MXgaGkxS4OZpawIvll/QXtHhFhRATkqosbM8qs5z55g+Hg== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: bd44e8b5-5260-4e89-00ed-08d7dd8a2ad4 X-MS-Exchange-CrossTenant-OriginalArrivalTime: 10 Apr 2020 20:02:59.1705 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 84df9e7f-e9f6-40af-b435-aaaaaaaaaaaa X-MS-Exchange-CrossTenant-FromEntityHeader: Internet X-MS-Exchange-CrossTenant-RMS-PersistedConsumerOrg: 00000000-0000-0000-0000-000000000000 X-MS-Exchange-Transport-CrossTenantHeadersStamped: MW2NAM12HT064 Content-Type: text/plain From: Michael Kubacki 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 Cc: Hao A Wu Cc: Jian J Wang Cc: Jiewen Yao Cc: Sean Brogan Signed-off-by: Michael Kubacki Reviewed-by: Jiewen Yao --- 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