From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mga01.intel.com (mga01.intel.com [192.55.52.88]) (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 C453E21AE2638 for ; Mon, 26 Jun 2017 20:20:37 -0700 (PDT) Received: from orsmga003.jf.intel.com ([10.7.209.27]) by fmsmga101.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 26 Jun 2017 20:22:07 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.39,399,1493708400"; d="scan'208";a="985540448" Received: from fmsmsx106.amr.corp.intel.com ([10.18.124.204]) by orsmga003.jf.intel.com with ESMTP; 26 Jun 2017 20:22:07 -0700 Received: from fmsmsx115.amr.corp.intel.com (10.18.116.19) by FMSMSX106.amr.corp.intel.com (10.18.124.204) with Microsoft SMTP Server (TLS) id 14.3.319.2; Mon, 26 Jun 2017 20:22:06 -0700 Received: from shsmsx103.ccr.corp.intel.com (10.239.4.69) by fmsmsx115.amr.corp.intel.com (10.18.116.19) with Microsoft SMTP Server (TLS) id 14.3.319.2; Mon, 26 Jun 2017 20:22:06 -0700 Received: from shsmsx104.ccr.corp.intel.com ([169.254.5.151]) by SHSMSX103.ccr.corp.intel.com ([169.254.4.116]) with mapi id 14.03.0319.002; Tue, 27 Jun 2017 11:22:04 +0800 From: "Ni, Ruiyu" To: "Zeng, Star" , "edk2-devel@lists.01.org" CC: "Gao, Liming" Thread-Topic: [PATCH V3 3/3] DuetPkg FsVariable: Update GetNextVariableName to follow UEFI 2.7 Thread-Index: AQHS7l2Hk/P7gDiaCkmXHBPjzMnZ9qI4DBYg Date: Tue, 27 Jun 2017 03:22:04 +0000 Deferred-Delivery: Tue, 27 Jun 2017 03:22:00 +0000 Message-ID: <734D49CCEBEEF84792F5B80ED585239D5B9A50DE@SHSMSX104.ccr.corp.intel.com> References: <1498468853-175036-1-git-send-email-star.zeng@intel.com> <1498468853-175036-4-git-send-email-star.zeng@intel.com> In-Reply-To: <1498468853-175036-4-git-send-email-star.zeng@intel.com> Accept-Language: en-US, zh-CN X-MS-Has-Attach: X-MS-TNEF-Correlator: x-originating-ip: [10.239.127.40] MIME-Version: 1.0 Subject: Re: [PATCH V3 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: , X-List-Received-Date: Tue, 27 Jun 2017 03:20:38 -0000 Content-Language: en-US Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: quoted-printable Reviewed-by: Ruiyu Ni Thanks/Ray > -----Original Message----- > From: Zeng, Star > Sent: Monday, June 26, 2017 5:21 PM > To: edk2-devel@lists.01.org > Cc: Zeng, Star ; Gao, Liming ; > Ni, Ruiyu > Subject: [PATCH V3 3/3] DuetPkg FsVariable: Update GetNextVariableName > to follow UEFI 2.7 >=20 > "The size must be large enough to fit input string supplied in VariableNa= me > 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. >=20 > This patch is to update code to follow them. >=20 > 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 | 31 > +++++++++++++++++++++++++++++-- > 1 file changed, 29 insertions(+), 2 deletions(-) >=20 > diff --git a/DuetPkg/FSVariable/FSVariable.c > b/DuetPkg/FSVariable/FSVariable.c index 34b79305c871..5feeade10d2f > 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 > protoect those. > Duet trusts all meta data from disk. If variable code, variable metadata= and > 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 > @@ -1387,7 +1387,8 @@ Routine Description: >=20 > Arguments: >=20 > - VariableNameSize Size of the variable > + VariableNameSize The size of the VariableName buffer. The s= ize > must be large > + enough to fit input string supplied in Var= iableName buffer. > VariableName Pointer to variable name > VendorGuid Variable Vendor Guid >=20 > @@ -1400,14 +1401,40 @@ Returns: > VARIABLE_POINTER_TRACK Variable; > UINTN VarNameSize; > EFI_STATUS Status; > + UINTN MaxLen; >=20 > if (VariableNameSize =3D=3D NULL || VariableName =3D=3D NULL || Vendor= Guid =3D=3D > NULL) { > return EFI_INVALID_PARAMETER; > } >=20 > + // > + // Calculate the possible maximum length of name string, including the= Null > terminator. > + // > + MaxLen =3D *VariableNameSize / sizeof (CHAR16); if ((MaxLen =3D=3D 0)= || > + (StrnLenS (VariableName, MaxLen) =3D=3D MaxLen)) { > + // > + // Null-terminator is not found in the first VariableNameSize bytes = of the > input VariableName buffer, > + // follow spec to return EFI_INVALID_PARAMETER. > + // > + return EFI_INVALID_PARAMETER; > + } > + > Status =3D FindVariable (VariableName, VendorGuid, &Variable); >=20 > if (Variable.CurrPtr =3D=3D NULL || EFI_ERROR (Status)) { > + // > + // For VariableName is an empty string, FindVariable() will try to f= ind and > return > + // the first qualified variable, and if FindVariable() returns error > (EFI_NOT_FOUND) > + // as no any variable is found, still go to return the error > (EFI_NOT_FOUND). > + // > + if (VariableName[0] !=3D 0) { > + // > + // For VariableName is not an empty string, and FindVariable() ret= urns > error as > + // VariableName and VendorGuid are not a name and GUID of an > existing variable, > + // there is no way to get next variable, follow spec to return > EFI_INVALID_PARAMETER. > + // > + Status =3D EFI_INVALID_PARAMETER; > + } > return Status; > } >=20 > -- > 2.7.0.windows.1