From nobody Wed May 15 12:28:16 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of groups.io designates 66.175.222.108 as permitted sender) client-ip=66.175.222.108; envelope-from=bounce+27952+102900+1787277+3901457@groups.io; helo=mail02.groups.io; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of groups.io designates 66.175.222.108 as permitted sender) smtp.mailfrom=bounce+27952+102900+1787277+3901457@groups.io; dmarc=fail(p=none dis=none) header.from=intel.com ARC-Seal: i=1; a=rsa-sha256; t=1681322209; cv=none; d=zohomail.com; s=zohoarc; b=mBeKqE64w8T9VM3IIeODYc/qVqGVM4D8L1K0PNPY4BYsiJwOt0KW4lcgUO6I+9adT2sw42WPkU/8rmXPt4JwBpaPK8RZ82SZLC7YtLtGpKfd8AzsQIugah7624MaMKsLxmZJ6yj+m+XTwpC/5njv+Jc/JF8avjhY41Eoj6rvtVI= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1681322209; h=Content-Transfer-Encoding:Cc:Date:From:List-Subscribe:List-Id:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Reply-To:Sender:Subject:To; bh=X42+oHPhHwEV4+YplgTpgVLvMSEF4hNF5Z1AGsBxq0E=; b=XdN9wWVdJmNYriuw4eRhYA2WFBsThG98Anlsc6eVhQ/aAyV19ljDh4HulGNM0ScT6TRIVanvKwqFgoAwfBl7xK/SpD0dCQUBkZLK/T4u8Ra7zgeLyqUqrrBvktHq2cM63l6M190ezhJ2QvR38KSF8MeMmjAC23r157ZeFIvTYrw= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of groups.io designates 66.175.222.108 as permitted sender) smtp.mailfrom=bounce+27952+102900+1787277+3901457@groups.io; dmarc=fail header.from= (p=none dis=none) Received: from mail02.groups.io (mail02.groups.io [66.175.222.108]) by mx.zohomail.com with SMTPS id 1681322209951250.78420085942594; Wed, 12 Apr 2023 10:56:49 -0700 (PDT) Return-Path: X-Received: by 127.0.0.2 with SMTP id RUDRYY1788612xY4oHIJQ8Er; Wed, 12 Apr 2023 10:56:49 -0700 X-Received: from mga01.intel.com (mga01.intel.com [192.55.52.88]) by mx.groups.io with SMTP id smtpd.web10.9791.1681207028243442442 for ; Tue, 11 Apr 2023 02:57:08 -0700 X-IronPort-AV: E=McAfee;i="6600,9927,10676"; a="371424990" X-IronPort-AV: E=Sophos;i="5.98,336,1673942400"; d="scan'208";a="371424990" X-Received: from orsmga005.jf.intel.com ([10.7.209.41]) by fmsmga101.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 11 Apr 2023 02:57:07 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10676"; a="862807972" X-IronPort-AV: E=Sophos;i="5.98,336,1673942400"; d="scan'208";a="862807972" X-Received: from linusliu-desk1.gar.corp.intel.com ([10.5.215.134]) by orsmga005.jf.intel.com with ESMTP; 11 Apr 2023 02:55:31 -0700 From: "Linus Liu" To: devel@edk2.groups.io Cc: Jiewen Yao , FST-FIR-PRC , FST FIR Server C , Maggie Chu Subject: [edk2-devel] [PATCH] Securitypkg/hddpassword: Update HddPasswordDxeInit to use Variable Policy Date: Tue, 11 Apr 2023 02:55:24 -0700 Message-Id: <20230411095524.1668-1-linus.liu@intel.com> MIME-Version: 1.0 Precedence: Bulk List-Unsubscribe: List-Subscribe: List-Help: Sender: devel@edk2.groups.io List-Id: Mailing-List: list devel@edk2.groups.io; contact devel+owner@edk2.groups.io Reply-To: devel@edk2.groups.io,linus.liu@intel.com X-Gm-Message-State: RCTfnkq0DGMarhqGDQ3ggJXGx1787277AA= Content-Transfer-Encoding: quoted-printable DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=groups.io; q=dns/txt; s=20140610; t=1681322209; bh=HOTJjmG5HF7WfEdFXrzpw8BdkXq724cycJoQf2MYs5I=; h=Cc:Date:From:Reply-To:Subject:To; b=bJZm1K5huBDtYKVpcmfhMIrfXjYR29DWoHZW8NZx2Sy3C1DkdYdOpoTfY2d5Mk3zOIC 9bAs2Jq3KPs+8btERv+YQC6Zv6U1FR10OedftbOoYx+6zd1VNQOR/K/Wxu3O8Bjdxhd1z C0EKGhZTl0knACmpxzz1pKJt+2BqkJD48TI= X-ZohoMail-DKIM: pass (identity @groups.io) X-ZM-MESSAGEID: 1681322211970100015 Content-Type: text/plain; charset="utf-8" REF: https://bugzilla.tianocore.org/show_bug.cgi?id=3D4408 Change-Id: I3c4b466ef318766d6d70c9f73e36b94b5f10832c Cc: Jiewen Yao Cc: FST-FIR-PRC Cc: FST FIR Server C Cc: Maggie Chu Signed-off-by: Linus Liu Reviewed-by: Jiewen Yao --- SecurityPkg/HddPassword/HddPasswordDxe.c | 16 +++++++++++----- SecurityPkg/HddPassword/HddPasswordDxe.h | 1 - SecurityPkg/HddPassword/HddPasswordDxe.inf | 3 ++- SecurityPkg/SecurityPkg.dsc | 1 + 4 files changed, 14 insertions(+), 7 deletions(-) diff --git a/SecurityPkg/HddPassword/HddPasswordDxe.c b/SecurityPkg/HddPass= word/HddPasswordDxe.c index a1a63b67a4..c20fdbe83f 100644 --- a/SecurityPkg/HddPassword/HddPasswordDxe.c +++ b/SecurityPkg/HddPassword/HddPasswordDxe.c @@ -9,6 +9,7 @@ **/ =20 #include "HddPasswordDxe.h" +#include =20 EFI_GUID mHddPasswordVendorGuid =3D HDD_PASSWORD_CONFIG_GUID; CHAR16 mHddPasswordVendorStorageName[] =3D L"HDD_PASSWORD_CONFIG"; @@ -2822,7 +2823,7 @@ HddPasswordDxeInit ( HDD_PASSWORD_DXE_PRIVATE_DATA *Private; VOID *Registration; EFI_EVENT EndOfDxeEvent; - EDKII_VARIABLE_LOCK_PROTOCOL *VariableLock; + EDKII_VARIABLE_POLICY_PROTOCOL *VariablePolicy; =20 Private =3D NULL; =20 @@ -2858,12 +2859,17 @@ HddPasswordDxeInit ( // // Make HDD_PASSWORD_VARIABLE_NAME variable read-only. // - Status =3D gBS->LocateProtocol (&gEdkiiVariableLockProtocolGuid, NULL, (= VOID **)&VariableLock); + Status =3D gBS->LocateProtocol (&gEdkiiVariablePolicyProtocolGuid, NULL,= (VOID **)&VariablePolicy); if (!EFI_ERROR (Status)) { - Status =3D VariableLock->RequestToLock ( - VariableLock, + Status =3D RegisterBasicVariablePolicy ( + VariablePolicy, + &mHddPasswordVendorGuid, HDD_PASSWORD_VARIABLE_NAME, - &mHddPasswordVendorGuid + VARIABLE_POLICY_NO_MIN_SIZE, + VARIABLE_POLICY_NO_MAX_SIZE, + VARIABLE_POLICY_NO_MUST_ATTR, + VARIABLE_POLICY_NO_CANT_ATTR, + VARIABLE_POLICY_TYPE_LOCK_NOW ); DEBUG ((DEBUG_INFO, "%a(): Lock %s variable (%r)\n", __FUNCTION__, HDD= _PASSWORD_VARIABLE_NAME, Status)); ASSERT_EFI_ERROR (Status); diff --git a/SecurityPkg/HddPassword/HddPasswordDxe.h b/SecurityPkg/HddPass= word/HddPasswordDxe.h index 231533e737..049a208794 100644 --- a/SecurityPkg/HddPassword/HddPasswordDxe.h +++ b/SecurityPkg/HddPassword/HddPasswordDxe.h @@ -17,7 +17,6 @@ #include #include #include -#include =20 #include #include diff --git a/SecurityPkg/HddPassword/HddPasswordDxe.inf b/SecurityPkg/HddPa= ssword/HddPasswordDxe.inf index 06e8755ffc..2c0ebbcc78 100644 --- a/SecurityPkg/HddPassword/HddPasswordDxe.inf +++ b/SecurityPkg/HddPassword/HddPasswordDxe.inf @@ -50,6 +50,7 @@ PrintLib UefiLib LockBoxLib + VariablePolicyHelperLib S3BootScriptLib PciLib BaseCryptLib @@ -63,7 +64,7 @@ gEfiHiiConfigAccessProtocolGuid ## PRODUCES gEfiAtaPassThruProtocolGuid ## CONSUMES gEfiPciIoProtocolGuid ## CONSUMES - gEdkiiVariableLockProtocolGuid ## CONSUMES + gEdkiiVariablePolicyProtocolGuid ## CONSUMES =20 [Pcd] gEfiSecurityPkgTokenSpaceGuid.PcdSkipHddPasswordPrompt ## CONSUMES diff --git a/SecurityPkg/SecurityPkg.dsc b/SecurityPkg/SecurityPkg.dsc index 3bad5375c0..3c62205162 100644 --- a/SecurityPkg/SecurityPkg.dsc +++ b/SecurityPkg/SecurityPkg.dsc @@ -74,6 +74,7 @@ PlatformPKProtectionLib|SecurityPkg/Library/PlatformPKProtectionLibVarPo= licy/PlatformPKProtectionLibVarPolicy.inf SecureBootVariableProvisionLib|SecurityPkg/Library/SecureBootVariablePro= visionLib/SecureBootVariableProvisionLib.inf TdxLib|MdePkg/Library/TdxLib/TdxLib.inf + VariablePolicyHelperLib|MdeModulePkg/Library/VariablePolicyHelperLib/Var= iablePolicyHelperLib.inf =20 [LibraryClasses.ARM, LibraryClasses.AARCH64] # --=20 2.33.1.windows.1 -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D- Groups.io Links: You receive all messages sent to this group. View/Reply Online (#102900): https://edk2.groups.io/g/devel/message/102900 Mute This Topic: https://groups.io/mt/98224856/1787277 Group Owner: devel+owner@edk2.groups.io Unsubscribe: https://edk2.groups.io/g/devel/unsub [importer@patchew.org] -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-