[PATCH] ShellPkg/Application/Shell: add array index check for shell delay option

[PATCH] ShellPkg/Application/Shell: add array index check for shell delay option

[Zhichao Gao]

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 | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/ShellPkg/Application/Shell/Shell.c b/ShellPkg/Application/Shell/Shell.c
index 104f4c8961..f4d9668d81 100644
--- a/ShellPkg/Application/Shell/Shell.c
+++ b/ShellPkg/Application/Shell/Shell.c
@@ -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

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

[Gao, Zhichao]

Ignore this patch. The commit massage is not in compliance with https://github.com/tianocore/tianocore.github.io/wiki/Commit-Message-Format.

> -----Original Message-----
> From: edk2-devel [mailto:edk2-devel-bounces@lists.01.org] On Behalf Of
> Zhichao Gao
> Sent: Thursday, February 14, 2019 10:55 AM
> To: edk2-devel@lists.01.org
> Cc: Gao, Liming <liming.gao@intel.com>
> Subject: [edk2] [PATCH] ShellPkg/Application/Shell: add array index check for
> shell delay option
> 
> 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 | 6 +++++-
>  1 file changed, 5 insertions(+), 1 deletion(-)
> 
> diff --git a/ShellPkg/Application/Shell/Shell.c
> b/ShellPkg/Application/Shell/Shell.c
> index 104f4c8961..f4d9668d81 100644
> --- a/ShellPkg/Application/Shell/Shell.c
> +++ b/ShellPkg/Application/Shell/Shell.c
> @@ -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