Re: [PATCH] ShellPkg: add array index check for shell delay option

["Carsey, Jaben" <jaben.carsey@intel.com>]

Reviewed-by: Jaben Carsey <jaben.carsey@intel.com>

> -----Original Message-----
> From: edk2-devel [mailto:edk2-devel-bounces@lists.01.org] On Behalf Of
> Zhichao Gao
> Sent: Monday, February 18, 2019 12:28 AM
> To: edk2-devel@lists.01.org
> Cc: Gao, Liming <liming.gao@intel.com>
> Subject: [edk2] [PATCH] ShellPkg: add array index check for shell delay
> option
> Importance: High
> 
> BZ: https://bugzilla.tianocore.org/show_bug.cgi?id=1528
> 
> Shell delay option without parameters do not check the
> index of shell parameter argv. Add index check to avoid
> invalid pointer references.
> 
> Contributed-under: TianoCore Contribution Agreement 1.1
> Signed-off-by: Zhichao Gao <zhichao.gao@intel.com>
> 
> Cc: Liming Gao <liming.gao@intel.com>
> Cc: Ray Ni <ray.ni@intel.com>
> ---
>  ShellPkg/Application/Shell/Shell.c | 8 ++++++--
>  1 file changed, 6 insertions(+), 2 deletions(-)
> 
> diff --git a/ShellPkg/Application/Shell/Shell.c
> b/ShellPkg/Application/Shell/Shell.c
> index 104f4c8961..ec344137d3 100644
> --- a/ShellPkg/Application/Shell/Shell.c
> +++ b/ShellPkg/Application/Shell/Shell.c
> @@ -1,7 +1,7 @@
>  /** @file
>    This is THE shell (application)
> 
> -  Copyright (c) 2009 - 2018, Intel Corporation. All rights reserved.<BR>
> +  Copyright (c) 2009 - 2019, Intel Corporation. All rights reserved.<BR>
>    (C) Copyright 2013-2014 Hewlett-Packard Development Company, L.P.<BR>
>    Copyright 2015-2018 Dell Technologies.<BR>
>    This program and the accompanying materials
> @@ -1002,7 +1002,11 @@ ProcessCommandLine(
>                                   ) == 0) {
>        ShellInfoObject.ShellInitSettings.BitUnion.Bits.Delay        = TRUE;
>        // Check for optional delay value following "-delay"
> -      DelayValueStr = gEfiShellParametersProtocol->Argv[LoopVar + 1];
> +      if ((LoopVar + 1) >= gEfiShellParametersProtocol->Argc) {
> +        DelayValueStr = NULL;
> +      } else {
> +        DelayValueStr = gEfiShellParametersProtocol->Argv[LoopVar + 1];
> +      }
>        if (DelayValueStr != NULL){
>          if (*DelayValueStr == L':') {
>            DelayValueStr++;
> --
> 2.16.2.windows.1
> 
> _______________________________________________
> edk2-devel mailing list
> edk2-devel@lists.01.org
> https://lists.01.org/mailman/listinfo/edk2-devel