From nobody Thu May 2 10:44:39 2024 Delivered-To: importer@patchew.org Received-SPF: none (zoho.com: 198.145.21.10 is neither permitted nor denied by domain of lists.01.org) client-ip=198.145.21.10; envelope-from=edk2-devel-bounces@lists.01.org; helo=ml01.01.org; Authentication-Results: mx.zoho.com; spf=none (zoho.com: 198.145.21.10 is neither permitted nor denied by domain of lists.01.org) smtp.mailfrom=edk2-devel-bounces@lists.01.org; Return-Path: Received: from ml01.01.org (ml01.01.org [198.145.21.10]) by mx.zohomail.com with SMTPS id 1498205301680799.9249522976804; Fri, 23 Jun 2017 01:08:21 -0700 (PDT) Received: from [127.0.0.1] (localhost [IPv6:::1]) by ml01.01.org (Postfix) with ESMTP id 4C32A21A00AD1; Fri, 23 Jun 2017 01:06:51 -0700 (PDT) Received: from mga04.intel.com (mga04.intel.com [192.55.52.120]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ml01.01.org (Postfix) with ESMTPS id A797E21A00AC9 for ; Fri, 23 Jun 2017 01:06:49 -0700 (PDT) Received: from fmsmga001.fm.intel.com ([10.253.24.23]) by fmsmga104.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 23 Jun 2017 01:08:15 -0700 Received: from shwdeopenpsi068.ccr.corp.intel.com ([10.239.9.2]) by fmsmga001.fm.intel.com with ESMTP; 23 Jun 2017 01:08:14 -0700 X-Original-To: edk2-devel@lists.01.org X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.39,377,1493708400"; d="scan'208";a="1163808260" From: Star Zeng To: edk2-devel@lists.01.org Date: Fri, 23 Jun 2017 16:08:08 +0800 Message-Id: <1498205290-157888-2-git-send-email-star.zeng@intel.com> X-Mailer: git-send-email 2.7.0.windows.1 In-Reply-To: <1498205290-157888-1-git-send-email-star.zeng@intel.com> References: <1498205290-157888-1-git-send-email-star.zeng@intel.com> Subject: [edk2] [PATCH V2 1/3] MdePkg: Update comments for GetNextVariableName to follow UEFI 2.7 X-BeenThere: edk2-devel@lists.01.org X-Mailman-Version: 2.1.22 Precedence: list List-Id: EDK II Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Liming Gao , Star Zeng MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Errors-To: edk2-devel-bounces@lists.01.org Sender: "edk2-devel" X-ZohoMail: RSF_4 Z_629925259 SPT_0 Content-Type: text/plain; charset="utf-8" "The size must be large enough to fit input string supplied in VariableName buffer" is added in the description for VariableNameSize. And two cases of EFI_INVALID_PARAMETER are added. 1. The input values of VariableName and VendorGuid are not a name and GUID of an existing variable. 2. Null-terminator is not found in the first VariableNameSize bytes of the input VariableName buffer. This patch is to update comments for GetNextVariableName to follow them. Cc: Liming Gao Contributed-under: TianoCore Contribution Agreement 1.0 Signed-off-by: Star Zeng Reviewed-by: Liming Gao --- MdePkg/Include/Uefi/UefiSpec.h | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/MdePkg/Include/Uefi/UefiSpec.h b/MdePkg/Include/Uefi/UefiSpec.h index eb662a35503c..0b84f4829749 100644 --- a/MdePkg/Include/Uefi/UefiSpec.h +++ b/MdePkg/Include/Uefi/UefiSpec.h @@ -661,7 +661,8 @@ EFI_STATUS /** Enumerates the current variable names. =20 - @param[in, out] VariableNameSize The size of the VariableName buffer. + @param[in, out] VariableNameSize The size of the VariableName buffer. T= he size must be large + enough to fit input string supplied in= VariableName buffer. @param[in, out] VariableName On input, supplies the last VariableNa= me that was returned by GetNextVariableName(). On output, r= eturns the Nullterminated string of the current variable. @@ -675,6 +676,10 @@ EFI_STATUS @retval EFI_INVALID_PARAMETER VariableNameSize is NULL. @retval EFI_INVALID_PARAMETER VariableName is NULL. @retval EFI_INVALID_PARAMETER VendorGuid is NULL. + @retval EFI_INVALID_PARAMETER The input values of VariableName and Vendo= rGuid are not a name and + GUID of an existing variable. + @retval EFI_INVALID_PARAMETER Null-terminator is not found in the first = VariableNameSize bytes of + the input VariableName buffer. @retval EFI_DEVICE_ERROR The variable could not be retrieved due to= a hardware error. =20 **/ --=20 2.7.0.windows.1 _______________________________________________ edk2-devel mailing list edk2-devel@lists.01.org https://lists.01.org/mailman/listinfo/edk2-devel From nobody Thu May 2 10:44:39 2024 Delivered-To: importer@patchew.org Received-SPF: none (zoho.com: 198.145.21.10 is neither permitted nor denied by domain of lists.01.org) client-ip=198.145.21.10; envelope-from=edk2-devel-bounces@lists.01.org; helo=ml01.01.org; Authentication-Results: mx.zoho.com; spf=none (zoho.com: 198.145.21.10 is neither permitted nor denied by domain of lists.01.org) smtp.mailfrom=edk2-devel-bounces@lists.01.org; Return-Path: Received: from ml01.01.org (ml01.01.org [198.145.21.10]) by mx.zohomail.com with SMTPS id 1498205303508210.23278913498382; Fri, 23 Jun 2017 01:08:23 -0700 (PDT) Received: from [127.0.0.1] (localhost [IPv6:::1]) by ml01.01.org (Postfix) with ESMTP id 8804821A00ACF; Fri, 23 Jun 2017 01:06:53 -0700 (PDT) Received: from mga04.intel.com (mga04.intel.com [192.55.52.120]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ml01.01.org (Postfix) with ESMTPS id 9AF3621A00ACB for ; Fri, 23 Jun 2017 01:06:51 -0700 (PDT) Received: from fmsmga001.fm.intel.com ([10.253.24.23]) by fmsmga104.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 23 Jun 2017 01:08:17 -0700 Received: from shwdeopenpsi068.ccr.corp.intel.com ([10.239.9.2]) by fmsmga001.fm.intel.com with ESMTP; 23 Jun 2017 01:08:15 -0700 X-Original-To: edk2-devel@lists.01.org X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.39,377,1493708400"; d="scan'208";a="1163808274" From: Star Zeng To: edk2-devel@lists.01.org Date: Fri, 23 Jun 2017 16:08:09 +0800 Message-Id: <1498205290-157888-3-git-send-email-star.zeng@intel.com> X-Mailer: git-send-email 2.7.0.windows.1 In-Reply-To: <1498205290-157888-1-git-send-email-star.zeng@intel.com> References: <1498205290-157888-1-git-send-email-star.zeng@intel.com> Subject: [edk2] [PATCH V2 2/3] MdeModulePkg Variable: Update GetNextVariableName to follow UEFI 2.7 X-BeenThere: edk2-devel@lists.01.org X-Mailman-Version: 2.1.22 Precedence: list List-Id: EDK II Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Liming Gao , Star Zeng MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Errors-To: edk2-devel-bounces@lists.01.org Sender: "edk2-devel" X-ZohoMail: RSF_4 Z_629925259 SPT_0 Content-Type: text/plain; charset="utf-8" "The size must be large enough to fit input string supplied in VariableName buffer" is added in the description for VariableNameSize. And two cases of EFI_INVALID_PARAMETER are added. 1. The input values of VariableName and VendorGuid are not a name and GUID of an existing variable. 2. Null-terminator is not found in the first VariableNameSize bytes of the input VariableName buffer. This patch is to update code to follow them. Cc: Liming Gao Contributed-under: TianoCore Contribution Agreement 1.0 Signed-off-by: Star Zeng Reviewed-by: Liming Gao --- .../Universal/Variable/EmuRuntimeDxe/EmuVariable.c | 25 ++++++++++++++++++= +++- .../Universal/Variable/RuntimeDxe/Variable.c | 19 ++++++++++++++++ 2 files changed, 43 insertions(+), 1 deletion(-) diff --git a/MdeModulePkg/Universal/Variable/EmuRuntimeDxe/EmuVariable.c b/= MdeModulePkg/Universal/Variable/EmuRuntimeDxe/EmuVariable.c index 27ea1496a044..6211ec52a439 100644 --- a/MdeModulePkg/Universal/Variable/EmuRuntimeDxe/EmuVariable.c +++ b/MdeModulePkg/Universal/Variable/EmuRuntimeDxe/EmuVariable.c @@ -3,7 +3,7 @@ Emulation Variable services operate on the runtime volatile memory. The nonvolatile variable space doesn't exist. =20 -Copyright (c) 2006 - 2016, Intel Corporation. All rights reserved.
+Copyright (c) 2006 - 2017, Intel Corporation. All rights reserved.
This program and the accompanying materials are licensed and made available under the terms and conditions of the BSD = License which accompanies this distribution. The full text of the license may be = found at @@ -1245,6 +1245,10 @@ Done: @retval EFI_BUFFER_TOO_SMALL VariableNameSize is too small for the res= ult.=20 VariableNameSize has been updated with th= e size needed to complete the request. @retval EFI_INVALID_PARAMETER VariableNameSize or VariableName or Vendo= rGuid is NULL. + @retval EFI_INVALID_PARAMETER The input values of VariableName and Vend= orGuid are not a name and + GUID of an existing variable. + @retval EFI_INVALID_PARAMETER Null-terminator is not found in the first= VariableNameSize bytes of + the input VariableName buffer. =20 **/ EFI_STATUS @@ -1259,16 +1263,35 @@ EmuGetNextVariableName ( VARIABLE_POINTER_TRACK Variable; UINTN VarNameSize; EFI_STATUS Status; + UINTN MaxLen; =20 if (VariableNameSize =3D=3D NULL || VariableName =3D=3D NULL || VendorGu= id =3D=3D NULL) { return EFI_INVALID_PARAMETER; } =20 + // + // Calculate the possible maximum length of name string, including the N= ull terminator. + // + MaxLen =3D *VariableNameSize / sizeof (CHAR16); + if ((MaxLen =3D=3D 0) || + ((VariableName[MaxLen - 1] !=3D 0) && (StrnLenS (VariableName, MaxLe= n) =3D=3D MaxLen))) { + // + // Null-terminator is not found in the first VariableNameSize bytes of= the input VariableName buffer. + // + return EFI_INVALID_PARAMETER; + } + AcquireLockOnlyAtBootTime(&Global->VariableServicesLock); =20 Status =3D FindVariable (VariableName, VendorGuid, &Variable, Global); =20 if (Variable.CurrPtr =3D=3D NULL || EFI_ERROR (Status)) { + if (VariableName[0] !=3D 0) { + // + // The input values of VariableName and VendorGuid are not a name an= d GUID of an existing variable. + // + Status =3D EFI_INVALID_PARAMETER; + } goto Done; } =20 diff --git a/MdeModulePkg/Universal/Variable/RuntimeDxe/Variable.c b/MdeMod= ulePkg/Universal/Variable/RuntimeDxe/Variable.c index 0a325de1659d..1e68c0a73a6d 100644 --- a/MdeModulePkg/Universal/Variable/RuntimeDxe/Variable.c +++ b/MdeModulePkg/Universal/Variable/RuntimeDxe/Variable.c @@ -2926,6 +2926,12 @@ VariableServiceGetNextVariableInternal ( =20 Status =3D FindVariable (VariableName, VendorGuid, &Variable, &mVariable= ModuleGlobal->VariableGlobal, FALSE); if (Variable.CurrPtr =3D=3D NULL || EFI_ERROR (Status)) { + if (VariableName[0] !=3D 0) { + // + // The input values of VariableName and VendorGuid are not a name an= d GUID of an existing variable. + // + Status =3D EFI_INVALID_PARAMETER; + } goto Done; } =20 @@ -3065,6 +3071,7 @@ VariableServiceGetNextVariableName ( ) { EFI_STATUS Status; + UINTN MaxLen; UINTN VarNameSize; VARIABLE_HEADER *VariablePtr; =20 @@ -3072,6 +3079,18 @@ VariableServiceGetNextVariableName ( return EFI_INVALID_PARAMETER; } =20 + // + // Calculate the possible maximum length of name string, including the N= ull terminator. + // + MaxLen =3D *VariableNameSize / sizeof (CHAR16); + if ((MaxLen =3D=3D 0) || + ((VariableName[MaxLen - 1] !=3D 0) && (StrnLenS (VariableName, MaxLe= n) =3D=3D MaxLen))) { + // + // Null-terminator is not found in the first VariableNameSize bytes of= the input VariableName buffer. + // + return EFI_INVALID_PARAMETER; + } + AcquireLockOnlyAtBootTime(&mVariableModuleGlobal->VariableGlobal.Variabl= eServicesLock); =20 Status =3D VariableServiceGetNextVariableInternal (VariableName, VendorG= uid, &VariablePtr); --=20 2.7.0.windows.1 _______________________________________________ edk2-devel mailing list edk2-devel@lists.01.org https://lists.01.org/mailman/listinfo/edk2-devel From nobody Thu May 2 10:44:39 2024 Delivered-To: importer@patchew.org Received-SPF: none (zoho.com: 198.145.21.10 is neither permitted nor denied by domain of lists.01.org) client-ip=198.145.21.10; envelope-from=edk2-devel-bounces@lists.01.org; helo=ml01.01.org; Authentication-Results: mx.zoho.com; spf=none (zoho.com: 198.145.21.10 is neither permitted nor denied by domain of lists.01.org) smtp.mailfrom=edk2-devel-bounces@lists.01.org; Return-Path: Received: from ml01.01.org (ml01.01.org [198.145.21.10]) by mx.zohomail.com with SMTPS id 1498205305872738.5341352959141; Fri, 23 Jun 2017 01:08:25 -0700 (PDT) Received: from [127.0.0.1] (localhost [IPv6:::1]) by ml01.01.org (Postfix) with ESMTP id C40B921A00AD6; Fri, 23 Jun 2017 01:06:55 -0700 (PDT) Received: from mga04.intel.com (mga04.intel.com [192.55.52.120]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ml01.01.org (Postfix) with ESMTPS id 924CD21A00AC9 for ; Fri, 23 Jun 2017 01:06:52 -0700 (PDT) Received: from fmsmga001.fm.intel.com ([10.253.24.23]) by fmsmga104.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 23 Jun 2017 01:08:18 -0700 Received: from shwdeopenpsi068.ccr.corp.intel.com ([10.239.9.2]) by fmsmga001.fm.intel.com with ESMTP; 23 Jun 2017 01:08:17 -0700 X-Original-To: edk2-devel@lists.01.org X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.39,377,1493708400"; d="scan'208";a="1163808286" From: Star Zeng To: edk2-devel@lists.01.org Date: Fri, 23 Jun 2017 16:08:10 +0800 Message-Id: <1498205290-157888-4-git-send-email-star.zeng@intel.com> X-Mailer: git-send-email 2.7.0.windows.1 In-Reply-To: <1498205290-157888-1-git-send-email-star.zeng@intel.com> References: <1498205290-157888-1-git-send-email-star.zeng@intel.com> Subject: [edk2] [PATCH V2 3/3] DuetPkg FsVariable: Update GetNextVariableName to follow UEFI 2.7 X-BeenThere: edk2-devel@lists.01.org X-Mailman-Version: 2.1.22 Precedence: list List-Id: EDK II Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Ruiyu Ni , Liming Gao , Star Zeng MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Errors-To: edk2-devel-bounces@lists.01.org Sender: "edk2-devel" X-ZohoMail: RSF_4 Z_629925259 SPT_0 Content-Type: text/plain; charset="utf-8" "The size must be large enough to fit input string supplied in VariableName buffer" is added in the description for VariableNameSize. And two cases of EFI_INVALID_PARAMETER are added. 1. The input values of VariableName and VendorGuid are not a name and GUID of an existing variable. 2. Null-terminator is not found in the first VariableNameSize bytes of the input VariableName buffer. This patch is to update code to follow them. Cc: Liming Gao Cc: Ruiyu Ni Contributed-under: TianoCore Contribution Agreement 1.0 Signed-off-by: Star Zeng Reviewed-by: Liming Gao --- DuetPkg/FSVariable/FSVariable.c | 21 ++++++++++++++++++++- 1 file changed, 20 insertions(+), 1 deletion(-) diff --git a/DuetPkg/FSVariable/FSVariable.c b/DuetPkg/FSVariable/FSVariabl= e.c index 34b79305c871..6069cfa8fb98 100644 --- a/DuetPkg/FSVariable/FSVariable.c +++ b/DuetPkg/FSVariable/FSVariable.c @@ -6,7 +6,7 @@ disk. They can be changed by user. BIOS is not able to prot= oect those. Duet trusts all meta data from disk. If variable code, variable metadata a= nd variable data is modified in inproper way, the behavior is undefined. =20 -Copyright (c) 2006 - 2016, Intel Corporation. All rights reserved.
+Copyright (c) 2006 - 2017, Intel Corporation. All rights reserved.
This program and the accompanying materials are licensed and made available under the terms and conditions of the BSD = License which accompanies this distribution. The full text of the license may be = found at @@ -1400,14 +1400,33 @@ Returns: VARIABLE_POINTER_TRACK Variable; UINTN VarNameSize; EFI_STATUS Status; + UINTN MaxLen; =20 if (VariableNameSize =3D=3D NULL || VariableName =3D=3D NULL || VendorGu= id =3D=3D NULL) { return EFI_INVALID_PARAMETER; } =20 + // + // Calculate the possible maximum length of name string, including the N= ull terminator. + // + MaxLen =3D *VariableNameSize / sizeof (CHAR16); + if ((MaxLen =3D=3D 0) || + ((VariableName[MaxLen - 1] !=3D 0) && (StrnLenS (VariableName, MaxLe= n) =3D=3D MaxLen))) { + // + // Null-terminator is not found in the first VariableNameSize bytes of= the input VariableName buffer. + // + return EFI_INVALID_PARAMETER; + } + Status =3D FindVariable (VariableName, VendorGuid, &Variable); =20 if (Variable.CurrPtr =3D=3D NULL || EFI_ERROR (Status)) { + if (VariableName[0] !=3D 0) { + // + // The input values of VariableName and VendorGuid are not a name an= d GUID of an existing variable. + // + Status =3D EFI_INVALID_PARAMETER; + } return Status; } =20 --=20 2.7.0.windows.1 _______________________________________________ edk2-devel mailing list edk2-devel@lists.01.org https://lists.01.org/mailman/listinfo/edk2-devel