From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from NAM11-BN8-obe.outbound.protection.outlook.com (NAM11-BN8-obe.outbound.protection.outlook.com [40.92.20.80]) by mx.groups.io with SMTP id smtpd.web10.18118.1586462803260665148 for ; Thu, 09 Apr 2020 13:06:43 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@outlook.com header.s=selector1 header.b=Smyb6v2L; spf=pass (domain: outlook.com, ip: 40.92.20.80, mailfrom: michael.kubacki@outlook.com) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=VXtS2j9yGOSojQtmcRZGpK7ldZQ1H5GZWcO1DaTGmlYWSR5oM1Y9tGu9TvZUX3Pnxk9VYJdmcKc9GHmCvsyJo91JKqznnw7Wdne/85ms6BzwUft3RAcvNCBvtVjyxRstrLOcqdfllZFWd5rqPksCqEMNMC1EdtGnp63gkyTE4RPM+dHjH2s5wlHfIp1gW04T7ADmNsmVvaWLbm3Y0H8EdAwcH63xxodubXFuVmLmF1EoCpKT8aOBMoB2aVmFW/rzphQjXhW+J2WiuXz5T4hdIypTPBsZ1I4vpc3ZnACCwb2Mg48MqE0PoDC9CFLHkZEQCTtDWvFfp9KbLWN8F2FeeQ== 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=+sd0n1k5rjF6kas8gHgwoNQlnwkryvXsh0rFLQACJv0=; b=m//5VaCRlux4SXv9w904c/PeIOLp2+MfovFUOOdPbLSVQ5GdmlzDjSBaj3XQz0apalCubAYd78NbZSKFrkWlVH538VApu8Dw91sNFdpfmd3YdmNL0wek5nPOowKuXelE5WuGhIbVvRZlOYrnnGj1kpH95VAgTUwqJuuxYZlESu3OKn0ojXy/DLusFPEoCyvOWyTYrOQ0BItAx93LjyGBjfld4pSimd5gqn7dsJ5+au379q9ftQtmbkfhVgHwVT2Uhydh8R97yrNFCFxi83rlXgeaGpXcyXaldlXNU3ntnLXyfaCiuQgSiGphFVeTM0hELfMgh+lZd5MrszfZ9gXyug== 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=+sd0n1k5rjF6kas8gHgwoNQlnwkryvXsh0rFLQACJv0=; b=Smyb6v2L6SFCIlroGUXaTiG2e5+fiMP+UhHno4CFig/2uBXoIseNvw8E+UpCIw9FgsduMYFR1vXrgEzEji2XgT2ZWoMRdJjFlCEC63QVlVkaf9AbymCVCNCXJQHCV8wBbIgMm0dey/2Pnk6KIaG4L/oX8qgp3HLqXo3sVKYMca2bAZikWLX97MsE7Sd3cIYUEjJQK2tD2ClPV8zx8uykOlGlEniJeC8RSBfGHF8LfwTtPRoegQ15cTTLMQTIGXdsCzvA7K0osltbYdzMOR3ef5aTYuja6GNywRWQMH1usq6Hb1HnUS/84cTktdTsTaSS5OlkBPbWVQ920YKooQWNmQ== Received: from BN8NAM11FT019.eop-nam11.prod.protection.outlook.com (2a01:111:e400:fc4b::4c) by BN8NAM11HT117.eop-nam11.prod.protection.outlook.com (2a01:111:e400:fc4b::446) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.2900.18; Thu, 9 Apr 2020 20:06:42 +0000 Received: from DM5PR07MB3435.namprd07.prod.outlook.com (2a01:111:e400:fc4b::44) by BN8NAM11FT019.mail.protection.outlook.com (2a01:111:e400:fc4b::158) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.2900.18 via Frontend Transport; Thu, 9 Apr 2020 20:06:42 +0000 X-IncomingTopHeaderMarker: OriginalChecksum:2B5DC8D584FD226813771CB94509519104CD7B82C476E1B0568639B875DF92AF;UpperCasedChecksum:7173271BBFB154B9BC03E348F289854D704FE6A3C519623594DA6D8F192902A2;SizeAsReceived:7870;Count:49 Received: from DM5PR07MB3435.namprd07.prod.outlook.com ([fe80::801e:fde0:da7d:191f]) by DM5PR07MB3435.namprd07.prod.outlook.com ([fe80::801e:fde0:da7d:191f%6]) with mapi id 15.20.2900.015; Thu, 9 Apr 2020 20:06:42 +0000 From: "Michael Kubacki" To: devel@edk2.groups.io Cc: Chao Zhang , Hao A Wu , Jian J Wang , Jiewen Yao , Sean Brogan Subject: [PATCH v1 7/7] SecurityPkg/HddPassword: Use BaseLib linked list iteration macros Date: Thu, 9 Apr 2020 13:05:14 -0700 Message-ID: X-Mailer: git-send-email 2.16.3.windows.1 In-Reply-To: <20200409200514.32796-1-michael.kubacki@outlook.com> References: <20200409200514.32796-1-michael.kubacki@outlook.com> X-ClientProxiedBy: MWHPR10CA0062.namprd10.prod.outlook.com (2603:10b6:300:2c::24) To DM5PR07MB3435.namprd07.prod.outlook.com (2603:10b6:4:67::14) Return-Path: michael.kubacki@outlook.com X-Microsoft-Original-Message-ID: <20200409200514.32796-8-michael.kubacki@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from localhost.localdomain (2001:4898:80e8:7:9d66:7f00:4b99:db3e) by MWHPR10CA0062.namprd10.prod.outlook.com (2603:10b6:300:2c::24) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.2900.15 via Frontend Transport; Thu, 9 Apr 2020 20:06:41 +0000 X-Mailer: git-send-email 2.16.3.windows.1 X-Microsoft-Original-Message-ID: <20200409200514.32796-8-michael.kubacki@outlook.com> X-TMN: [F2VsRzkMYQqGoj0Uyo5EeFvEM5KqRy6f3I/+1BIpixjoIhdZkEQ2PYWnVpqJTfTt] X-MS-PublicTrafficType: Email X-IncomingHeaderCount: 49 X-EOPAttributedMessage: 0 X-MS-Office365-Filtering-Correlation-Id: 4eb87bcd-9a9e-42ad-7989-08d7dcc18541 X-MS-TrafficTypeDiagnostic: BN8NAM11HT117: X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: jtNw/vx/89RbzNYcKbDTEsYNI+Q8cnwC520aryyUIVy+6Cw55lDOXPX9pkZpABKUMLxRTPYj39HX86EkySzmEE5Htnp3mwyWci8u7z4Y82HLg9K1OTYU0O22kxSIGB93BxX+fPVX9YGQnuqcp7Vuxqfi1LuD6C3G3KhlfuR06DIV2T43+zMbBhHzbNlAMgoE9E/QzjJi8+km5fikgeVCI7+U7kxD2SOeSSr7sSEmPuQ= X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:0;SRV:;IPV:NLI;SFV:NSPM;H:DM5PR07MB3435.namprd07.prod.outlook.com;PTR:;CAT:NONE;SFTY:;SFS:;DIR:OUT;SFP:1901; X-MS-Exchange-AntiSpam-MessageData: QPJWBBrKMqS26UFEdvFgdML1+Zd11cSSq8skBBQ0ZNhR4AniXFX60LpA4h65qhJIdXeq8vT3EdYJQx8WyRrwDRNZzOwayzOKjgFnTpzq/hhBgSrREOVNG2Cv37pEM7FHfOaPvArnCO01SuTAOOdU3unfdwHaQlYBRiMc0GSnN8d9A3xxz9GzCufoZSHM0aKr8geNwetU4LDGoaFxDKYnAA== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 4eb87bcd-9a9e-42ad-7989-08d7dcc18541 X-MS-Exchange-CrossTenant-OriginalArrivalTime: 09 Apr 2020 20:06:42.0393 (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: BN8NAM11HT117 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 --- 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