diff options
| author | Gao, Zhichao <zhichao.gao@intel.com> | 2019-08-12 08:36:21 -0700 |
|---|---|---|
| committer | Jaben Carsey <jaben.carsey@intel.com> | 2019-08-12 19:51:36 -0700 |
| commit | 12dcad5b1ec58eb33c351854ae37942b996ed2e5 (patch) | |
| tree | 6b14ca6d36284ed4a2c9dfcfe98037179a282cf5 /ShellPkg/Library/UefiShellLevel2CommandsLib | |
| parent | 48d5d6d5e09e5089d1c95c2d0812449e87f4ef7e (diff) | |
| download | edk2-12dcad5b1ec58eb33c351854ae37942b996ed2e5.zip edk2-12dcad5b1ec58eb33c351854ae37942b996ed2e5.tar.gz edk2-12dcad5b1ec58eb33c351854ae37942b996ed2e5.tar.bz2 | |
ShellPkg/UefiShellLevel2CommansLib: Pointer Resonse should be checked
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@intel.com>
Cc: Ray Ni <ray.ni@intel.com>
Signed-off-by: Zhichao Gao <zhichao.gao@intel.com>
Reviewed-by: Jaben Carsey <jaben.carsey@intel.com>
Diffstat (limited to 'ShellPkg/Library/UefiShellLevel2CommandsLib')
| -rw-r--r-- | ShellPkg/Library/UefiShellLevel2CommandsLib/Cp.c | 5 | ||||
| -rw-r--r-- | ShellPkg/Library/UefiShellLevel2CommandsLib/Mv.c | 5 |
2 files changed, 8 insertions, 2 deletions
diff --git a/ShellPkg/Library/UefiShellLevel2CommandsLib/Cp.c b/ShellPkg/Library/UefiShellLevel2CommandsLib/Cp.c index 18b05b5..4a2c2cf 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,6 +101,9 @@ CopySingleFile( // possibly return based on response
//
if (!SilentMode) {
+ if (Response == NULL) {
+ return SHELL_ABORTED;
+ }
switch (*(SHELL_PROMPT_RESPONSE*)Response) {
case ShellPromptResponseNo:
//
diff --git a/ShellPkg/Library/UefiShellLevel2CommandsLib/Mv.c b/ShellPkg/Library/UefiShellLevel2CommandsLib/Mv.c index 8c2852d..f50c1e4 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,6 +637,9 @@ ValidateAndMoveFiles( if (Response == NULL) {
ShellPromptForResponseHii(ShellPromptResponseTypeYesNoAllCancel, STRING_TOKEN (STR_GEN_DEST_EXIST_OVR), gShellLevel2HiiHandle, &Response);
}
+ if (Response == NULL) {
+ return SHELL_ABORTED;
+ }
switch (*(SHELL_PROMPT_RESPONSE*)Response) {
case ShellPromptResponseNo:
FreePool(Response);
|