From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received-SPF: Pass (sender SPF authorized) identity=mailfrom; client-ip=66.187.233.73; helo=mx1.redhat.com; envelope-from=lersek@redhat.com; receiver=edk2-devel@lists.01.org Received: from mx1.redhat.com (mx3-rdu2.redhat.com [66.187.233.73]) (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 EE369203B85B2 for ; Sat, 12 May 2018 12:52:11 -0700 (PDT) Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.rdu2.redhat.com [10.11.54.4]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 4271440006ED; Sat, 12 May 2018 19:52:10 +0000 (UTC) Received: from lacos-laptop-7.usersys.redhat.com (ovpn-120-16.rdu2.redhat.com [10.10.120.16]) by smtp.corp.redhat.com (Postfix) with ESMTP id 2D1862026DFD; Sat, 12 May 2018 19:52:08 +0000 (UTC) To: cinnamon shia , edk2-devel@lists.01.org Cc: star.zeng@intel.com, Ansen Huang References: <20180511152112.33156-1-cinnamon.shia@hpe.com> From: Laszlo Ersek Message-ID: Date: Sat, 12 May 2018 21:52:08 +0200 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:52.0) Gecko/20100101 Thunderbird/52.7.0 MIME-Version: 1.0 In-Reply-To: <20180511152112.33156-1-cinnamon.shia@hpe.com> X-Scanned-By: MIMEDefang 2.78 on 10.11.54.4 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.11.55.5]); Sat, 12 May 2018 19:52:10 +0000 (UTC) X-Greylist: inspected by milter-greylist-4.5.16 (mx1.redhat.com [10.11.55.5]); Sat, 12 May 2018 19:52:10 +0000 (UTC) for IP:'10.11.54.4' DOMAIN:'int-mx04.intmail.prod.int.rdu2.redhat.com' HELO:'smtp.corp.redhat.com' FROM:'lersek@redhat.com' RCPT:'' Subject: Re: [PATCH v2 1/2] MdeModulePkg Variable: Fix a corner case issue about setting a variable X-BeenThere: edk2-devel@lists.01.org X-Mailman-Version: 2.1.26 Precedence: list List-Id: EDK II Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 12 May 2018 19:52:12 -0000 Content-Type: text/plain; charset=utf-8 Content-Language: en-US Content-Transfer-Encoding: 7bit Hi Cinnamon, On 05/11/18 17:21, cinnamon shia wrote: > Fix the issue that failed to update or add a UEFI variable if the remaining size is equal to the data size > of the variable. > > Contributed-under: TianoCore Contribution Agreement 1.0 > Signed-off-by: cinnamon shia > Signed-off-by: Ansen Huang > --- > MdeModulePkg/Universal/Variable/RuntimeDxe/Variable.c | 6 +++--- > 1 file changed, 3 insertions(+), 3 deletions(-) > > diff --git a/MdeModulePkg/Universal/Variable/RuntimeDxe/Variable.c b/MdeModulePkg/Universal/Variable/RuntimeDxe/Variable.c > index 6caf603b3d..7303681aaa 100644 > --- a/MdeModulePkg/Universal/Variable/RuntimeDxe/Variable.c > +++ b/MdeModulePkg/Universal/Variable/RuntimeDxe/Variable.c > @@ -17,7 +17,7 @@ > integer overflow. It should also check attribute to avoid authentication bypass. > > Copyright (c) 2006 - 2017, Intel Corporation. All rights reserved.
> -(C) Copyright 2015 Hewlett Packard Enterprise Development LP
> +(C) Copyright 2015-2018 Hewlett Packard Enterprise Development LP
> 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 > @@ -288,7 +288,7 @@ UpdateVariableStore ( > DataPtr += mVariableModuleGlobal->VariableGlobal.NonVolatileVariableBase; > } > > - if ((DataPtr + DataSize) >= ((EFI_PHYSICAL_ADDRESS) (UINTN) ((UINT8 *) FwVolHeader + FwVolHeader->FvLength))) { > + if ((DataPtr + DataSize) > ((EFI_PHYSICAL_ADDRESS) (UINTN) ((UINT8 *) FwVolHeader + FwVolHeader->FvLength))) { > return EFI_INVALID_PARAMETER; > } > } else { > @@ -301,7 +301,7 @@ UpdateVariableStore ( > DataPtr += mVariableModuleGlobal->VariableGlobal.VolatileVariableBase; > } > > - if ((DataPtr + DataSize) >= ((UINTN) ((UINT8 *) VolatileBase + VolatileBase->Size))) { > + if ((DataPtr + DataSize) > ((UINTN) ((UINT8 *) VolatileBase + VolatileBase->Size))) { > return EFI_INVALID_PARAMETER; > } > > the series looks OK to me on a quick skim, but I prefer that the MdeModulePkg maintainers review this, if that's OK with you. Thanks Laszlo