Re: [PATCH v2 1/2] MdeModulePkg Variable: Fix a corner case issue about setting a variable

[Laszlo Ersek <lersek@redhat.com>]

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 <cinnamon.shia@hpe.com>
> Signed-off-by: Ansen Huang <ansen.huang@hpe.com>
> ---
>  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.<BR>
> -(C) Copyright 2015 Hewlett Packard Enterprise Development LP<BR>
> +(C) Copyright 2015-2018 Hewlett Packard Enterprise Development LP<BR>
>  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