[edk2-devel] [PATCH] ShellPkg/UefiShellLevel2CommansLib: Pointer Resonse should be checked

[Gao, Zhichao]

REF: https://bugzilla.tianocore.org/show_bug.cgi?id=2049

ShellPkg\Library\UefiShellLevel2CommandsLib\Cp.c line 104 and
ShellPkg\Library\UefiShellLevel2CommandsLib\Mv.c line 640, the
pointer variable Response may be a NULL pointer. So we should
make sure that it isn't NULL before dereference it.

If Response is NULL that indicates a EFI_OUT_OF_RESOURCES
error, directly return SHELL_ABORTED.

Cc: Jaben Carsey <jaben.carsey at intel.com>
Cc: Ray Ni <ray.ni at intel.com>
Signed-off-by: Zhichao Gao <zhichao.gao at intel.com>
---
 .../Library/UefiShellLevel2CommandsLib/Cp.c   | 42 ++++++++-------
 .../Library/UefiShellLevel2CommandsLib/Mv.c   | 52 ++++++++++---------
 2 files changed, 51 insertions(+), 43 deletions(-)

diff --git a/ShellPkg/Library/UefiShellLevel2CommandsLib/Cp.c b/ShellPkg/Library/UefiShellLevel2CommandsLib/Cp.c
index 18b05b5803..632d50229a 100644
--- a/ShellPkg/Library/UefiShellLevel2CommandsLib/Cp.c
+++ b/ShellPkg/Library/UefiShellLevel2CommandsLib/Cp.c
@@ -2,7 +2,7 @@
   Main file for cp shell level 2 function.
 
   (C) Copyright 2015 Hewlett-Packard Development Company, L.P.<BR>
-  Copyright (c) 2009 - 2018, Intel Corporation. All rights reserved.<BR>
+  Copyright (c) 2009 - 2019, Intel Corporation. All rights reserved.<BR>
   SPDX-License-Identifier: BSD-2-Clause-Patent
 
 **/
@@ -101,24 +101,28 @@ CopySingleFile(
     // possibly return based on response
     //
     if (!SilentMode) {
-      switch (*(SHELL_PROMPT_RESPONSE*)Response) {
-        case ShellPromptResponseNo:
-          //
-          // return success here so we dont stop the process
-          //
-          return (SHELL_SUCCESS);
-        case ShellPromptResponseCancel:
-          *Resp = Response;
-          //
-          // indicate to stop everything
-          //
-          return (SHELL_ABORTED);
-        case ShellPromptResponseAll:
-          *Resp = Response;
-        case ShellPromptResponseYes:
-          break;
-        default:
-          return SHELL_ABORTED;
+      if (Response != NULL) {
+        switch (*(SHELL_PROMPT_RESPONSE*)Response) {
+          case ShellPromptResponseNo:
+            //
+            // return success here so we dont stop the process
+            //
+            return (SHELL_SUCCESS);
+          case ShellPromptResponseCancel:
+            *Resp = Response;
+            //
+            // indicate to stop everything
+            //
+            return (SHELL_ABORTED);
+          case ShellPromptResponseAll:
+            *Resp = Response;
+          case ShellPromptResponseYes:
+            break;
+          default:
+            return SHELL_ABORTED;
+        }
+      } else {
+        return SHELL_ABORTED;
       }
     }
   }
diff --git a/ShellPkg/Library/UefiShellLevel2CommandsLib/Mv.c b/ShellPkg/Library/UefiShellLevel2CommandsLib/Mv.c
index 8c2852d7eb..2cfa588a8c 100644
--- a/ShellPkg/Library/UefiShellLevel2CommandsLib/Mv.c
+++ b/ShellPkg/Library/UefiShellLevel2CommandsLib/Mv.c
@@ -2,7 +2,7 @@
   Main file for mv shell level 2 function.
 
   (C) Copyright 2013-2015 Hewlett-Packard Development Company, L.P.<BR>
-  Copyright (c) 2009 - 2018, Intel Corporation. All rights reserved.<BR>
+  Copyright (c) 2009 - 2019, Intel Corporation. All rights reserved.<BR>
   SPDX-License-Identifier: BSD-2-Clause-Patent
 
 **/
@@ -637,29 +637,33 @@ ValidateAndMoveFiles(
       if (Response == NULL) {
         ShellPromptForResponseHii(ShellPromptResponseTypeYesNoAllCancel, STRING_TOKEN (STR_GEN_DEST_EXIST_OVR), gShellLevel2HiiHandle, &Response);
       }
-      switch (*(SHELL_PROMPT_RESPONSE*)Response) {
-        case ShellPromptResponseNo:
-          FreePool(Response);
-          Response = NULL;
-          continue;
-        case ShellPromptResponseCancel:
-          *Resp = Response;
-          //
-          // indicate to stop everything
-          //
-          SHELL_FREE_NON_NULL(FullCwd);
-          return (SHELL_ABORTED);
-        case ShellPromptResponseAll:
-          *Resp = Response;
-          break;
-        case ShellPromptResponseYes:
-          FreePool(Response);
-          Response = NULL;
-          break;
-        default:
-          FreePool(Response);
-          SHELL_FREE_NON_NULL(FullCwd);
-          return SHELL_ABORTED;
+      if (Response != NULL) {
+        switch (*(SHELL_PROMPT_RESPONSE*)Response) {
+          case ShellPromptResponseNo:
+            FreePool(Response);
+            Response = NULL;
+            continue;
+          case ShellPromptResponseCancel:
+            *Resp = Response;
+            //
+            // indicate to stop everything
+            //
+            SHELL_FREE_NON_NULL(FullCwd);
+            return (SHELL_ABORTED);
+          case ShellPromptResponseAll:
+            *Resp = Response;
+            break;
+          case ShellPromptResponseYes:
+            FreePool(Response);
+            Response = NULL;
+            break;
+          default:
+            FreePool(Response);
+            SHELL_FREE_NON_NULL(FullCwd);
+            return SHELL_ABORTED;
+        }
+      } else {
+        return SHELL_ABORTED;
       }
       Status = ShellDeleteFileByName(FullDestPath!=NULL? FullDestPath:DestPath);
     }
-- 
2.21.0.windows.1


-=-=-=-=-=-=-=-=-=-=-=-
Groups.io Links: You receive all messages sent to this group.

View/Reply Online (#45054): https://edk2.groups.io/g/devel/message/45054
Mute This Topic: https://groups.io/mt/32794224/1813853
Group Owner: devel+owner at edk2.groups.io
Unsubscribe: https://edk2.groups.io/g/devel/unsub  [edk2-devel-archive at redhat.com]
-=-=-=-=-=-=-=-=-=-=-=-