From nobody Mon Feb 9 18:44:10 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of groups.io designates 66.175.222.12 as permitted sender) client-ip=66.175.222.12; envelope-from=bounce+27952+65504+1787277+3901457@groups.io; helo=web01.groups.io; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of groups.io designates 66.175.222.12 as permitted sender) smtp.mailfrom=bounce+27952+65504+1787277+3901457@groups.io ARC-Seal: i=1; a=rsa-sha256; t=1600841381; cv=none; d=zohomail.com; s=zohoarc; b=cbOOlwi289VEXnMWdRliI5som52c8otaZ7VhfCPe4VxirNpnbtZxK6BuBbUwAfCOwZFzjdU3CHe9h0MoY5/9RYZIyyRrQzKNXTfJjk3/64F4SVr1pLfJngkUT+U6A/KQQTYzVaxcKSuS8NvyloYgQJY+Ji1qo7Ql/J0OkD2/9Ss= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1600841381; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Id:List-Unsubscribe:MIME-Version:Message-ID:Reply-To:References:Sender:Subject:To; bh=5tcfCXzziuxJjFpTPIdhPW5acIVc2jiRYcBfDHze6o8=; b=Rs0ztPV3D9WTdTDnyrUjKIvUjh5Q7O/icArAbe/jzwWNxRqFjAf7AqMPAFco0abm2D2IIfDxoyoLm11/d3C6CcCpH2idFB3y1KnJgdR+5oy51Go9ussAClWItWTmA6iUBNRD6WrCPHaW9VXcquHVRZ0Wc/ZA9V7VfFu12i5cfjk= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of groups.io designates 66.175.222.12 as permitted sender) smtp.mailfrom=bounce+27952+65504+1787277+3901457@groups.io Received: from web01.groups.io (web01.groups.io [66.175.222.12]) by mx.zohomail.com with SMTPS id 1600841381868296.55805880176365; Tue, 22 Sep 2020 23:09:41 -0700 (PDT) Return-Path: X-Received: by 127.0.0.2 with SMTP id rQDfYY1788612x6QpbR8bR0a; Tue, 22 Sep 2020 23:09:41 -0700 X-Received: from mail-pf1-f194.google.com (mail-pf1-f194.google.com [209.85.210.194]) by mx.groups.io with SMTP id smtpd.web12.6851.1600841381057379867 for ; Tue, 22 Sep 2020 23:09:41 -0700 X-Received: by mail-pf1-f194.google.com with SMTP id x123so14387963pfc.7 for ; Tue, 22 Sep 2020 23:09:41 -0700 (PDT) X-Gm-Message-State: S9XJBa3lgY9P6Nben9lXMIHkx1787277AA= X-Google-Smtp-Source: ABdhPJx6NMcG/7HTJE1REV/+9Kpj3wBOrcpkOxtpr1Kj5LvWHBJKWu5bWio8CRdW0jSBehrV97XVaA== X-Received: by 2002:a62:3585:0:b029:142:2501:3985 with SMTP id c127-20020a6235850000b029014225013985mr7568080pfa.74.1600841380161; Tue, 22 Sep 2020 23:09:40 -0700 (PDT) X-Received: from localhost.localdomain (174-21-140-128.tukw.qwest.net. [174.21.140.128]) by smtp.gmail.com with ESMTPSA id x4sm16960498pff.57.2020.09.22.23.09.39 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 22 Sep 2020 23:09:39 -0700 (PDT) From: "Bret Barkelew" X-Google-Original-From: Bret Barkelew To: devel@edk2.groups.io Cc: Jian J Wang , Hao A Wu , Liming Gao , Bret Barkelew , Dandan Bi Subject: [edk2-devel] [PATCH v8 10/14] MdeModulePkg: Allow VariablePolicy state to delete protected variables Date: Tue, 22 Sep 2020 23:07:44 -0700 Message-Id: <20200923060748.3795-11-bret.barkelew@microsoft.com> In-Reply-To: <20200923060748.3795-1-bret.barkelew@microsoft.com> References: <20200923060748.3795-1-bret.barkelew@microsoft.com> MIME-Version: 1.0 Precedence: Bulk List-Unsubscribe: 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,bret@corthon.com Content-Transfer-Encoding: quoted-printable DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=groups.io; q=dns/txt; s=20140610; t=1600841381; bh=e/JtdC8qpD00ecqslMSYDOVXsCKTmPn/a9u7ePN2yjg=; h=Cc:Date:From:Reply-To:Subject:To; b=PQCYd+IuZSBIysNoUUXBUJffBvQdKOGW9O83XpWKnJjo4yF2Odhkl95DJ9Hmh2fgwPu 3qxn+deU/kJoF0dPlNtpUnBoLQGUTnr4Fd8FYfCnd2zCVmjKoaeVn9wWp8oqWQofAk2lT xxNJzGa+7nOMu2oiBWDKAD/Ukh2FhsHl7bU= X-ZohoMail-DKIM: pass (identity @groups.io) Content-Type: text/plain; charset="utf-8" From: Bret Barkelew https://bugzilla.tianocore.org/show_bug.cgi?id=3D2522 TcgMorLockSmm provides special protections for the TCG MOR variables. This will check IsVariablePolicyEnabled() before enforcing them to allow variable deletion when policy engine is disabled. Only allows deletion, not modification. Cc: Jian J Wang Cc: Hao A Wu Cc: Liming Gao Cc: Bret Barkelew Signed-off-by: Bret Barkelew Reviewed-by: Dandan Bi Acked-by: Jian J Wang --- MdeModulePkg/Universal/Variable/RuntimeDxe/TcgMorLockSmm.c | 10 += +++++++++ MdeModulePkg/Universal/Variable/RuntimeDxe/VariableStandaloneMm.inf | 2 ++ 2 files changed, 12 insertions(+) diff --git a/MdeModulePkg/Universal/Variable/RuntimeDxe/TcgMorLockSmm.c b/M= deModulePkg/Universal/Variable/RuntimeDxe/TcgMorLockSmm.c index 6d80eb64341a..085f82035f4b 100644 --- a/MdeModulePkg/Universal/Variable/RuntimeDxe/TcgMorLockSmm.c +++ b/MdeModulePkg/Universal/Variable/RuntimeDxe/TcgMorLockSmm.c @@ -5,6 +5,7 @@ This module adds Variable Hook and check MemoryOverwriteRequestControlLo= ck. =20 Copyright (c) 2016 - 2018, Intel Corporation. All rights reserved.
+Copyright (c) Microsoft Corporation. SPDX-License-Identifier: BSD-2-Clause-Patent =20 **/ @@ -17,6 +18,10 @@ SPDX-License-Identifier: BSD-2-Clause-Patent #include #include "Variable.h" =20 +#include + +#include + typedef struct { CHAR16 *VariableName; EFI_GUID *VendorGuid; @@ -341,6 +346,11 @@ SetVariableCheckHandlerMor ( return EFI_SUCCESS; } =20 + // Permit deletion when policy is disabled. + if (!IsVariablePolicyEnabled() && ((Attributes =3D=3D 0) || (DataSize = =3D=3D 0))) { + return EFI_SUCCESS; + } + // // MorLock variable // diff --git a/MdeModulePkg/Universal/Variable/RuntimeDxe/VariableStandaloneM= m.inf b/MdeModulePkg/Universal/Variable/RuntimeDxe/VariableStandaloneMm.inf index 6e17f6cdf588..d8f480be27cc 100644 --- a/MdeModulePkg/Universal/Variable/RuntimeDxe/VariableStandaloneMm.inf +++ b/MdeModulePkg/Universal/Variable/RuntimeDxe/VariableStandaloneMm.inf @@ -20,6 +20,7 @@ # # Copyright (c) 2010 - 2019, Intel Corporation. All rights reserved.
# Copyright (c) 2018, Linaro, Ltd. All rights reserved.
+# Copyright (c) Microsoft Corporation. # SPDX-License-Identifier: BSD-2-Clause-Patent # ## @@ -74,6 +75,7 @@ [LibraryClasses] StandaloneMmDriverEntryPoint SynchronizationLib VarCheckLib + VariablePolicyLib =20 [Protocols] gEfiSmmFirmwareVolumeBlockProtocolGuid ## CONSUMES --=20 2.28.0.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 (#65504): https://edk2.groups.io/g/devel/message/65504 Mute This Topic: https://groups.io/mt/77029628/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-