From nobody Mon Feb 9 07:05:15 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of groups.io designates 66.175.222.12 as permitted sender) client-ip=66.175.222.12; envelope-from=bounce+27952+48075+1787277+3901457@groups.io; helo=web01.groups.io; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zoho.com: domain of groups.io designates 66.175.222.12 as permitted sender) smtp.mailfrom=bounce+27952+48075+1787277+3901457@groups.io; dmarc=fail(p=none dis=none) header.from=intel.com ARC-Seal: i=1; a=rsa-sha256; t=1569473482; cv=none; d=zoho.com; s=zohoarc; b=nWD5b2VQFCsfYfdQM1QGyaOZGQNAWb0hiz3uAjPye5+bW1xkp9ay7Qcs2AOukgRBVMFJ/eKtbC6JDpxvbg7AkwJgjkjOjGNLMZZfIjDGVMRcshgG/zHsKNk9yDs3SeHlQWW7vFOImyQSx7RTaVQHfvzqNKZFrd5eVYmKtGy91Gw= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1569473482; h=Cc:Date:From:In-Reply-To:List-Id:List-Unsubscribe:Message-ID:Reply-To:References:Sender:Subject:To:ARC-Authentication-Results; bh=VEPiOPiJAOKmjXuvpUK+oP4YkuaOpOUcIOFegiZo4Rg=; b=E6ny1Vj1BWiplmXHFClyRsuOH4T7lYoUcQwlmFUviM/IKnba24gGwJG9+YSAKMbzVNl5MPiepMpjqH3qL9cA3nN6v9qD+9/7PYn9P0Y+TfGLOuM1rcwtlW7pUqSUUy/0omZ8GurIoOpWCBKB5JwtMRVz7gr6y69vCjglrgxrOd0= ARC-Authentication-Results: i=1; mx.zoho.com; dkim=pass; spf=pass (zoho.com: domain of groups.io designates 66.175.222.12 as permitted sender) smtp.mailfrom=bounce+27952+48075+1787277+3901457@groups.io; dmarc=fail header.from= (p=none dis=none) header.from= Received: from web01.groups.io (web01.groups.io [66.175.222.12]) by mx.zohomail.com with SMTPS id 156947348296462.35639830223931; Wed, 25 Sep 2019 21:51:22 -0700 (PDT) Return-Path: X-Received: by 127.0.0.2 with SMTP id 70h4YY1788612xIIuFZX25sA; Wed, 25 Sep 2019 21:51:22 -0700 X-Received: from mga02.intel.com (mga02.intel.com []) by groups.io with SMTP; Wed, 25 Sep 2019 21:51:21 -0700 X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False X-Received: from orsmga003.jf.intel.com ([10.7.209.27]) by orsmga101.jf.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 25 Sep 2019 21:51:21 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.64,550,1559545200"; d="scan'208";a="191570779" X-Received: from makuback-desk1.amr.corp.intel.com ([10.7.159.162]) by orsmga003.jf.intel.com with ESMTP; 25 Sep 2019 21:51:21 -0700 From: "Kubacki, Michael A" To: devel@edk2.groups.io Cc: Dandan Bi , Ard Biesheuvel , Eric Dong , Laszlo Ersek , Liming Gao , Michael D Kinney , Ray Ni , Jian J Wang , Hao A Wu , Jiewen Yao Subject: [edk2-devel] [PATCH V1 5/5] MdeModulePkg/VariableSmm: Remove unused SMI handler functions Date: Wed, 25 Sep 2019 21:50:46 -0700 Message-Id: <20190926045046.34592-6-michael.a.kubacki@intel.com> In-Reply-To: <20190926045046.34592-1-michael.a.kubacki@intel.com> References: <20190926045046.34592-1-michael.a.kubacki@intel.com> 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,michael.a.kubacki@intel.com X-Gm-Message-State: WsVdRrvI8gLajDBOaYmG1Zydx1787277AA= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=groups.io; q=dns/txt; s=20140610; t=1569473482; bh=pAXE1LQcBrFTw65ziJICSMSRnJS8cNEAFgMlW47F2vM=; h=Cc:Date:From:Reply-To:Subject:To; b=uhU0Fej/5BGjFHeK1jEEEOHbBsklWAgOL5qIIZHR1/ZgjSnqguQo9xfNg8SPrlhpPU3 tc80uPTdh+zx1QnCLPILK7VvQnX20UjC8OdWlTYkeS1JSQotan2Aq+LyHK+SKKn4Glx6l DcqZgpXkWJvwOw2PCegE4k8HLNsXIPOc9Yk= X-ZohoMail-DKIM: pass (identity @groups.io) Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" REF:https://bugzilla.tianocore.org/show_bug.cgi?id=3D2220 Since Runtime Services GetVariable() and GetNextVariableName() no longer trigger a SW SMI, this change removes the code for handling those requests from VariableSmm.c. The following SMM communicate functions are removed from SmmVariableHandler(): 1. SMM_VARIABLE_FUNCTION_GET_VARIABLE 2. SMM_VARIABLE_FUNCTION_GET_NEXT_VARIABLE_NAME The function numbers are retained so any calls to those functions from previously built drivers will return EFI_UNSUPPORTED. Cc: Dandan Bi Cc: Ard Biesheuvel Cc: Eric Dong Cc: Laszlo Ersek Cc: Liming Gao Cc: Michael D Kinney Cc: Ray Ni Cc: Jian J Wang Cc: Hao A Wu Cc: Jiewen Yao Signed-off-by: Michael Kubacki --- MdeModulePkg/Include/Guid/SmmVariableCommon.h | 4 +- MdeModulePkg/Universal/Variable/RuntimeDxe/VariableSmm.c | 101 -----------= --------- 2 files changed, 1 insertion(+), 104 deletions(-) diff --git a/MdeModulePkg/Include/Guid/SmmVariableCommon.h b/MdeModulePkg/I= nclude/Guid/SmmVariableCommon.h index ceef44dfd2..6a73d1e21a 100644 --- a/MdeModulePkg/Include/Guid/SmmVariableCommon.h +++ b/MdeModulePkg/Include/Guid/SmmVariableCommon.h @@ -106,7 +106,7 @@ typedef struct { EFI_GUID Guid; UINTN NameSize; // Return name buffer size CHAR16 Name[1]; -} SMM_VARIABLE_COMMUNICATE_GET_NEXT_VARIABLE_NAME; +} SMM_VARIABLE_COMMUNICATE_LOCK_VARIABLE; =20 /// /// This structure is used to communicate with SMI handler by QueryVariabl= eInfo. @@ -118,8 +118,6 @@ typedef struct { UINT32 Attributes; } SMM_VARIABLE_COMMUNICATE_QUERY_VARIABLE_INFO; =20 -typedef SMM_VARIABLE_COMMUNICATE_GET_NEXT_VARIABLE_NAME SMM_VARIABLE_COMMU= NICATE_LOCK_VARIABLE; - typedef struct { EFI_GUID Guid; UINTN NameSize; diff --git a/MdeModulePkg/Universal/Variable/RuntimeDxe/VariableSmm.c b/Mde= ModulePkg/Universal/Variable/RuntimeDxe/VariableSmm.c index 1cb6092582..72448ddb46 100644 --- a/MdeModulePkg/Universal/Variable/RuntimeDxe/VariableSmm.c +++ b/MdeModulePkg/Universal/Variable/RuntimeDxe/VariableSmm.c @@ -464,7 +464,6 @@ SmmVariableHandler ( EFI_STATUS Status; SMM_VARIABLE_COMMUNICATE_HEADER *SmmVariableFunc= tionHeader; SMM_VARIABLE_COMMUNICATE_ACCESS_VARIABLE *SmmVariableHead= er; - SMM_VARIABLE_COMMUNICATE_GET_NEXT_VARIABLE_NAME *GetNextVariable= Name; SMM_VARIABLE_COMMUNICATE_QUERY_VARIABLE_INFO *QueryVariableIn= fo; SMM_VARIABLE_COMMUNICATE_GET_PAYLOAD_SIZE *GetPayloadSize; SMM_VARIABLE_COMMUNICATE_RUNTIME_VARIABLE_CACHE_CONTEXT *RuntimeVariable= CacheContext; @@ -475,7 +474,6 @@ SmmVariableHandler ( VARIABLE_RUNTIME_CACHE_CONTEXT *VariableCacheCo= ntext; VARIABLE_STORE_HEADER *VariableCache; UINTN InfoSize; - UINTN NameBufferSize; UINTN CommBufferPayloa= dSize; UINTN TempCommBufferSi= ze; =20 @@ -505,105 +503,6 @@ SmmVariableHandler ( =20 SmmVariableFunctionHeader =3D (SMM_VARIABLE_COMMUNICATE_HEADER *)CommBuf= fer; switch (SmmVariableFunctionHeader->Function) { - case SMM_VARIABLE_FUNCTION_GET_VARIABLE: - if (CommBufferPayloadSize < OFFSET_OF(SMM_VARIABLE_COMMUNICATE_ACCES= S_VARIABLE, Name)) { - DEBUG ((EFI_D_ERROR, "GetVariable: SMM communication buffer size i= nvalid!\n")); - return EFI_SUCCESS; - } - // - // Copy the input communicate buffer payload to pre-allocated SMM va= riable buffer payload. - // - CopyMem (mVariableBufferPayload, SmmVariableFunctionHeader->Data, Co= mmBufferPayloadSize); - SmmVariableHeader =3D (SMM_VARIABLE_COMMUNICATE_ACCESS_VARIABLE *) m= VariableBufferPayload; - if (((UINTN)(~0) - SmmVariableHeader->DataSize < OFFSET_OF(SMM_VARIA= BLE_COMMUNICATE_ACCESS_VARIABLE, Name)) || - ((UINTN)(~0) - SmmVariableHeader->NameSize < OFFSET_OF(SMM_VARIAB= LE_COMMUNICATE_ACCESS_VARIABLE, Name) + SmmVariableHeader->DataSize)) { - // - // Prevent InfoSize overflow happen - // - Status =3D EFI_ACCESS_DENIED; - goto EXIT; - } - InfoSize =3D OFFSET_OF(SMM_VARIABLE_COMMUNICATE_ACCESS_VARIABLE, Nam= e) - + SmmVariableHeader->DataSize + SmmVariableHeader->NameSi= ze; - - // - // SMRAM range check already covered before - // - if (InfoSize > CommBufferPayloadSize) { - DEBUG ((EFI_D_ERROR, "GetVariable: Data size exceed communication = buffer size limit!\n")); - Status =3D EFI_ACCESS_DENIED; - goto EXIT; - } - - // - // The VariableSpeculationBarrier() call here is to ensure the previ= ous - // range/content checks for the CommBuffer have been completed befor= e the - // subsequent consumption of the CommBuffer content. - // - VariableSpeculationBarrier (); - if (SmmVariableHeader->NameSize < sizeof (CHAR16) || SmmVariableHead= er->Name[SmmVariableHeader->NameSize/sizeof (CHAR16) - 1] !=3D L'\0') { - // - // Make sure VariableName is A Null-terminated string. - // - Status =3D EFI_ACCESS_DENIED; - goto EXIT; - } - - Status =3D VariableServiceGetVariable ( - SmmVariableHeader->Name, - &SmmVariableHeader->Guid, - &SmmVariableHeader->Attributes, - &SmmVariableHeader->DataSize, - (UINT8 *)SmmVariableHeader->Name + SmmVariableHeader->Nam= eSize - ); - CopyMem (SmmVariableFunctionHeader->Data, mVariableBufferPayload, Co= mmBufferPayloadSize); - break; - - case SMM_VARIABLE_FUNCTION_GET_NEXT_VARIABLE_NAME: - if (CommBufferPayloadSize < OFFSET_OF(SMM_VARIABLE_COMMUNICATE_GET_N= EXT_VARIABLE_NAME, Name)) { - DEBUG ((EFI_D_ERROR, "GetNextVariableName: SMM communication buffe= r size invalid!\n")); - return EFI_SUCCESS; - } - // - // Copy the input communicate buffer payload to pre-allocated SMM va= riable buffer payload. - // - CopyMem (mVariableBufferPayload, SmmVariableFunctionHeader->Data, Co= mmBufferPayloadSize); - GetNextVariableName =3D (SMM_VARIABLE_COMMUNICATE_GET_NEXT_VARIABLE_= NAME *) mVariableBufferPayload; - if ((UINTN)(~0) - GetNextVariableName->NameSize < OFFSET_OF(SMM_VARI= ABLE_COMMUNICATE_GET_NEXT_VARIABLE_NAME, Name)) { - // - // Prevent InfoSize overflow happen - // - Status =3D EFI_ACCESS_DENIED; - goto EXIT; - } - InfoSize =3D OFFSET_OF(SMM_VARIABLE_COMMUNICATE_GET_NEXT_VARIABLE_NA= ME, Name) + GetNextVariableName->NameSize; - - // - // SMRAM range check already covered before - // - if (InfoSize > CommBufferPayloadSize) { - DEBUG ((EFI_D_ERROR, "GetNextVariableName: Data size exceed commun= ication buffer size limit!\n")); - Status =3D EFI_ACCESS_DENIED; - goto EXIT; - } - - NameBufferSize =3D CommBufferPayloadSize - OFFSET_OF(SMM_VARIABLE_CO= MMUNICATE_GET_NEXT_VARIABLE_NAME, Name); - if (NameBufferSize < sizeof (CHAR16) || GetNextVariableName->Name[Na= meBufferSize/sizeof (CHAR16) - 1] !=3D L'\0') { - // - // Make sure input VariableName is A Null-terminated string. - // - Status =3D EFI_ACCESS_DENIED; - goto EXIT; - } - - Status =3D VariableServiceGetNextVariableName ( - &GetNextVariableName->NameSize, - GetNextVariableName->Name, - &GetNextVariableName->Guid - ); - CopyMem (SmmVariableFunctionHeader->Data, mVariableBufferPayload, Co= mmBufferPayloadSize); - break; - case SMM_VARIABLE_FUNCTION_SET_VARIABLE: if (CommBufferPayloadSize < OFFSET_OF(SMM_VARIABLE_COMMUNICATE_ACCES= S_VARIABLE, Name)) { DEBUG ((EFI_D_ERROR, "SetVariable: SMM communication buffer size i= nvalid!\n")); --=20 2.16.2.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 (#48075): https://edk2.groups.io/g/devel/message/48075 Mute This Topic: https://groups.io/mt/34295313/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-