From nobody Mon Feb 9 08:34:11 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+61586+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+61586+1787277+3901457@groups.io ARC-Seal: i=1; a=rsa-sha256; t=1592911128; cv=none; d=zohomail.com; s=zohoarc; b=bOo3xJn80XHHkV1EPNJXUoW2te+HEShP6EOU1jq5GX+7mCbMcCzQzbG8RJx0PAl9qNZkaEL20HCH5dh6/jbiXJZNQahT5aOOCvMlHTjXmTePAQ8urP7/46P2DHqNtY4F/a8YKh5LM/kww5gEOtjOFHYH0w0qiNskypfenz6sXAo= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1592911128; 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=EUlu4AVZ8is33jomzVBC8djzpbGTNYepSyQq9ZsqT88=; b=fWGpCp4w5lpuzBDxQD9P590v/Q7rpQGa5hsMJBrKBnj2zsGphPi3JAFCy6F/owbGMlD6O/NJ2YvB3yeVqijecr8vcVipES0fbmexdHjudpZkljvDAobhKEN+wPckTRaFvnmFxG1vuw6QtBRCVEg7LOHKoOvmpnDsYd+rRz2P30c= 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+61586+1787277+3901457@groups.io Received: from web01.groups.io (web01.groups.io [66.175.222.12]) by mx.zohomail.com with SMTPS id 1592911128087597.8286494735547; Tue, 23 Jun 2020 04:18:48 -0700 (PDT) Return-Path: X-Received: by 127.0.0.2 with SMTP id hjXEYY1788612xNr79CybMad; Tue, 23 Jun 2020 04:18:47 -0700 X-Received: from mail-pj1-f65.google.com (mail-pj1-f65.google.com [209.85.216.65]) by mx.groups.io with SMTP id smtpd.web10.1728.1592894704325537164 for ; Mon, 22 Jun 2020 23:45:04 -0700 X-Received: by mail-pj1-f65.google.com with SMTP id ga6so1062064pjb.1 for ; Mon, 22 Jun 2020 23:45:04 -0700 (PDT) X-Gm-Message-State: d7EP0mSMkMrASHGaYdjy7SeDx1787277AA= X-Google-Smtp-Source: ABdhPJwVvG8T/7KSBZBy2RGqfRzUS+MKkALmwJhur0gq7o202kbWLwQamE+FLTbGOgGqMcGnSuLKew== X-Received: by 2002:a17:902:ba81:: with SMTP id k1mr22915966pls.218.1592894703649; Mon, 22 Jun 2020 23:45:03 -0700 (PDT) X-Received: from localhost.localdomain (174-21-80-75.tukw.qwest.net. [174.21.80.75]) by smtp.gmail.com with ESMTPSA id d6sm1383818pjh.5.2020.06.22.23.45.03 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 22 Jun 2020 23:45:03 -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 Subject: [edk2-devel] [PATCH v6 10/14] MdeModulePkg: Allow VariablePolicy state to delete protected variables Date: Mon, 22 Jun 2020 23:41:00 -0700 Message-Id: <20200623064104.1908-11-brbarkel@microsoft.com> In-Reply-To: <20200623064104.1908-1-brbarkel@microsoft.com> References: <20200623064104.1908-1-brbarkel@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=1592911127; bh=JFhjMMycgybNz+39KOoKGIEJPCW+owns7m1bBOm9//g=; h=Cc:Date:From:Reply-To:Subject:To; b=SANB60BoXwL6p0MxgB16tDn8H+c+g276wYP93706GdGt5zqun0yvsuchj4ByngZK7o9 NxHhf2fI0y06BKo9BP8iRbY/4IbTjcDyV0vjYQfmoaMesCj6ihJcfveJ62AxfVIVSzCkJ zV/gk7ZH1zkKx9rrXdbFxvYNSUtwAhcYJoo= X-ZohoMail-DKIM: pass (identity @groups.io) Content-Type: text/plain; charset="utf-8" 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 --- 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.26.2.windows.1.8.g01c50adf56.20200515075929 -=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 (#61586): https://edk2.groups.io/g/devel/message/61586 Mute This Topic: https://groups.io/mt/75057695/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-