Reviewed-by: Zhichao Gao <zhichao.gao@...>

Thanks,
Zhichao

From: Michael Kubacki <michael.kubacki@...>

Fixes CodeQL alerts for CWE-457:
https://cwe.mitre.org/data/definitions/457.html

Cc: Erich McMillan <emcmillan@...>
Cc: Michael D Kinney <michael.d.kinney@...>
Cc: Michael Kubacki <mikuback@...>
Cc: Ray Ni <ray.ni@...>
Cc: Zhichao Gao <zhichao.gao@...>
Co-authored-by: Erich McMillan <emcmillan@...>
Signed-off-by: Michael Kubacki <michael.kubacki@...>
---
ShellPkg/Application/Shell/Shell.c | 1 +
ShellPkg/Application/Shell/ShellProtocol.c | 60 +++++++=
+++----------
ShellPkg/Library/UefiShellCommandLib/UefiShellCommandLib.c | 56 +++++++=
++---------
ShellPkg/Library/UefiShellDebug1CommandsLib/Dblk.c | 18 +++---
ShellPkg/Library/UefiShellDebug1CommandsLib/EfiDecompress.c | 9 ++-
ShellPkg/Library/UefiShellDriver1CommandsLib/Connect.c | 14 +++--
ShellPkg/Library/UefiShellDriver1CommandsLib/Disconnect.c | 17 ++++--
ShellPkg/Library/UefiShellDriver1CommandsLib/DrvDiag.c | 21 +++----
8 files changed, 107 insertions(+), 89 deletions(-)

diff --git a/ShellPkg/Application/Shell/Shell.c b/ShellPkg/Application/Sh=
ell/Shell.c
index df00adfdfa5b..89a677a32978 100644
--- a/ShellPkg/Application/Shell/Shell.c
+++ b/ShellPkg/Application/Shell/Shell.c
@@ -1300,6 +1300,7 @@ DoStartupScript (
CHAR16 *FullFileStringPath;
UINTN NewSize;
=20
+ CalleeStatus =3D EFI_SUCCESS;
Key.UnicodeChar =3D CHAR_NULL;
Key.ScanCode =3D 0;
=20
diff --git a/ShellPkg/Application/Shell/ShellProtocol.c b/ShellPkg/Applic=
ation/Shell/ShellProtocol.c
index 509eb60e40f4..d04b47538b96 100644
--- a/ShellPkg/Application/Shell/ShellProtocol.c
+++ b/ShellPkg/Application/Shell/ShellProtocol.c
@@ -729,50 +729,52 @@ EfiShellGetDeviceName (
//
// Now check the parent controller using this as the child.
//
- if (DeviceNameToReturn =3D=3D NULL) {
- PARSE_HANDLE_DATABASE_PARENTS (DeviceHandle, &ParentControllerCoun=
t, &ParentControllerBuffer);
+ Status =3D PARSE_HANDLE_DATABASE_PARENTS (DeviceHandle, &ParentContr=
ollerCount, &ParentControllerBuffer);
+ if ((DeviceNameToReturn =3D=3D NULL) && !EFI_ERROR (Status)) {
for (LoopVar =3D 0; LoopVar < ParentControllerCount; LoopVar++) {
- PARSE_HANDLE_DATABASE_UEFI_DRIVERS (ParentControllerBuffer[LoopV=
ar], &ParentDriverCount, &ParentDriverBuffer);
- for (HandleCount =3D 0; HandleCount < ParentDriverCount; HandleC=
ount++) {
- //
- // try using that driver's component name with controller and =
our driver as the child.
- //
- Status =3D gBS->OpenProtocol (
- ParentDriverBuffer[HandleCount],
- &gEfiComponentName2ProtocolGuid,
- (VOID **)&CompName2,
- gImageHandle,
- NULL,
- EFI_OPEN_PROTOCOL_GET_PROTOCOL
- );
- if (EFI_ERROR (Status)) {
+ Status =3D PARSE_HANDLE_DATABASE_UEFI_DRIVERS (ParentControllerB=
uffer[LoopVar], &ParentDriverCount, &ParentDriverBuffer);
+ if (!EFI_ERROR (Status)) {
+ for (HandleCount =3D 0; HandleCount < ParentDriverCount; Handl=
eCount++) {
+ //
+ // try using that driver's component name with controller an=
d our driver as the child.
+ //
Status =3D gBS->OpenProtocol (
ParentDriverBuffer[HandleCount],
- &gEfiComponentNameProtocolGuid,
+ &gEfiComponentName2ProtocolGuid,
(VOID **)&CompName2,
gImageHandle,
NULL,
EFI_OPEN_PROTOCOL_GET_PROTOCOL
);
- }
+ if (EFI_ERROR (Status)) {
+ Status =3D gBS->OpenProtocol (
+ ParentDriverBuffer[HandleCount],
+ &gEfiComponentNameProtocolGuid,
+ (VOID **)&CompName2,
+ gImageHandle,
+ NULL,
+ EFI_OPEN_PROTOCOL_GET_PROTOCOL
+ );
+ }
+
+ if (EFI_ERROR (Status)) {
+ continue;
+ }
=20
- if (EFI_ERROR (Status)) {
- continue;
+ Lang =3D GetBestLanguageForDriver (CompName2->SupportedLan=
guages, Language, FALSE);
+ Status =3D CompName2->GetControllerName (CompName2, ParentCo=
ntrollerBuffer[LoopVar], DeviceHandle, Lang, &DeviceNameToReturn);
+ FreePool (Lang);
+ Lang =3D NULL;
+ if (!EFI_ERROR (Status) && (DeviceNameToReturn !=3D NULL)) {
+ break;
+ }
}
=20
- Lang =3D GetBestLanguageForDriver (CompName2->SupportedLangu=
ages, Language, FALSE);
- Status =3D CompName2->GetControllerName (CompName2, ParentCont=
rollerBuffer[LoopVar], DeviceHandle, Lang, &DeviceNameToReturn);
- FreePool (Lang);
- Lang =3D NULL;
+ SHELL_FREE_NON_NULL (ParentDriverBuffer);
if (!EFI_ERROR (Status) && (DeviceNameToReturn !=3D NULL)) {
break;
}
}
-
- SHELL_FREE_NON_NULL (ParentDriverBuffer);
- if (!EFI_ERROR (Status) && (DeviceNameToReturn !=3D NULL)) {
- break;
- }
}
=20
SHELL_FREE_NON_NULL (ParentControllerBuffer);
diff --git a/ShellPkg/Library/UefiShellCommandLib/UefiShellCommandLib.c b=
/ShellPkg/Library/UefiShellCommandLib/UefiShellCommandLib.c
index 36cf46fb2c38..4549cbde9b9a 100644
--- a/ShellPkg/Library/UefiShellCommandLib/UefiShellCommandLib.c
+++ b/ShellPkg/Library/UefiShellCommandLib/UefiShellCommandLib.c
@@ -1399,10 +1399,11 @@ ShellCommandCreateInitialMappingsAndPaths (
CHAR16 *MapName;
SHELL_MAP_LIST *MapListItem;
=20
- SplitCurDir =3D NULL;
- MapName =3D NULL;
- MapListItem =3D NULL;
- HandleList =3D NULL;
+ ConsistMappingTable =3D NULL;
+ SplitCurDir =3D NULL;
+ MapName =3D NULL;
+ MapListItem =3D NULL;
+ HandleList =3D NULL;
=20
//
// Reset the static members back to zero
@@ -1458,32 +1459,35 @@ ShellCommandCreateInitialMappingsAndPaths (
//
PerformQuickSort (DevicePathList, Count, sizeof (EFI_DEVICE_PATH_PRO=
TOCOL *), DevicePathCompare);
=20
- ShellCommandConsistMappingInitialize (&ConsistMappingTable);
- //
- // Assign new Mappings to all...
- //
- for (Count =3D 0; HandleList[Count] !=3D NULL; Count++) {
+ if (!EFI_ERROR (ShellCommandConsistMappingInitialize (&ConsistMappin=
gTable))) {
//
- // Get default name first
+ // Assign new Mappings to all...
//
- NewDefaultName =3D ShellCommandCreateNewMappingName (MappingTypeFi=
leSystem);
- ASSERT (NewDefaultName !=3D NULL);
- Status =3D ShellCommandAddMapItemAndUpdatePath (NewDefaultName, De=
vicePathList[Count], 0, TRUE);
- ASSERT_EFI_ERROR (Status);
- FreePool (NewDefaultName);
-
- //
- // Now do consistent name
- //
- NewConsistName =3D ShellCommandConsistMappingGenMappingName (Devic=
ePathList[Count], ConsistMappingTable);
- if (NewConsistName !=3D NULL) {
- Status =3D ShellCommandAddMapItemAndUpdatePath (NewConsistName, =
DevicePathList[Count], 0, FALSE);
+ for (Count =3D 0; HandleList[Count] !=3D NULL; Count++) {
+ //
+ // Get default name first
+ //
+ NewDefaultName =3D ShellCommandCreateNewMappingName (MappingType=
FileSystem);
+ ASSERT (NewDefaultName !=3D NULL);
+ Status =3D ShellCommandAddMapItemAndUpdatePath (NewDefaultName, =
DevicePathList[Count], 0, TRUE);
ASSERT_EFI_ERROR (Status);
- FreePool (NewConsistName);
+ FreePool (NewDefaultName);
+
+ //
+ // Now do consistent name
+ //
+ NewConsistName =3D ShellCommandConsistMappingGenMappingName (Dev=
icePathList[Count], ConsistMappingTable);
+ if (NewConsistName !=3D NULL) {
+ Status =3D ShellCommandAddMapItemAndUpdatePath (NewConsistName=
, DevicePathList[Count], 0, FALSE);
+ ASSERT_EFI_ERROR (Status);
+ FreePool (NewConsistName);
+ }
}
}
=20
- ShellCommandConsistMappingUnInitialize (ConsistMappingTable);
+ if (ConsistMappingTable !=3D NULL) {
+ ShellCommandConsistMappingUnInitialize (ConsistMappingTable);
+ }
=20
SHELL_FREE_NON_NULL (HandleList);
SHELL_FREE_NON_NULL (DevicePathList);
@@ -1626,12 +1630,12 @@ ShellCommandUpdateMapping (
//
PerformQuickSort (DevicePathList, Count, sizeof (EFI_DEVICE_PATH_PRO=
TOCOL *), DevicePathCompare);
=20
- ShellCommandConsistMappingInitialize (&ConsistMappingTable);
+ Status =3D ShellCommandConsistMappingInitialize (&ConsistMappingTabl=
e);
=20
//
// Assign new Mappings to remainders
//
- for (Count =3D 0; !EFI_ERROR (Status) && HandleList[Count] !=3D NULL=
&& !EFI_ERROR (Status); Count++) {
+ for (Count =3D 0; !EFI_ERROR (Status) && HandleList[Count] !=3D NULL=
; Count++) {
//
// Skip ones that already have
//
diff --git a/ShellPkg/Library/UefiShellDebug1CommandsLib/Dblk.c b/ShellPk=
g/Library/UefiShellDebug1CommandsLib/Dblk.c
index 97a4b57a932f..5329b559ba46 100644
--- a/ShellPkg/Library/UefiShellDebug1CommandsLib/Dblk.c
+++ b/ShellPkg/Library/UefiShellDebug1CommandsLib/Dblk.c
@@ -158,7 +158,10 @@ ShellCommandRunDblk (
ShellStatus =3D SHELL_INVALID_PARAMETER;
}
=20
- ShellConvertStringToUint64 (LbaString, &Lba, TRUE, FALSE);
+ if (EFI_ERROR (ShellConvertStringToUint64 (LbaString, &Lba, TRUE=
, FALSE))) {
+ ShellPrintHiiEx (-1, -1, NULL, STRING_TOKEN (STR_GEN_PARAM_INV=
), gShellDebug1HiiHandle, L"dblk", LbaString);
+ ShellStatus =3D SHELL_INVALID_PARAMETER;
+ }
}
=20
if (BlockCountString =3D=3D NULL) {
@@ -169,12 +172,13 @@ ShellCommandRunDblk (
ShellStatus =3D SHELL_INVALID_PARAMETER;
}
=20
- ShellConvertStringToUint64 (BlockCountString, &BlockCount, TRUE,=
FALSE);
- if (BlockCount > 0x10) {
- BlockCount =3D 0x10;
- } else if (BlockCount =3D=3D 0) {
- ShellPrintHiiEx (-1, -1, NULL, STRING_TOKEN (STR_GEN_PARAM_INV=
), gShellDebug1HiiHandle, L"dblk", BlockCountString);
- ShellStatus =3D SHELL_INVALID_PARAMETER;
+ if (!EFI_ERROR (ShellConvertStringToUint64 (BlockCountString, &B=
lockCount, TRUE, FALSE))) {
+ if (BlockCount > 0x10) {
+ BlockCount =3D 0x10;
+ } else if (BlockCount =3D=3D 0) {
+ ShellPrintHiiEx (-1, -1, NULL, STRING_TOKEN (STR_GEN_PARAM_I=
NV), gShellDebug1HiiHandle, L"dblk", BlockCountString);
+ ShellStatus =3D SHELL_INVALID_PARAMETER;
+ }
}
}
=20
diff --git a/ShellPkg/Library/UefiShellDebug1CommandsLib/EfiDecompress.c =
b/ShellPkg/Library/UefiShellDebug1CommandsLib/EfiDecompress.c
index 8bf23a2076a1..72f8c087cb69 100644
--- a/ShellPkg/Library/UefiShellDebug1CommandsLib/EfiDecompress.c
+++ b/ShellPkg/Library/UefiShellDebug1CommandsLib/EfiDecompress.c
@@ -112,10 +112,13 @@ ShellCommandRunEfiDecompress (
=20
if (ShellStatus =3D=3D SHELL_SUCCESS) {
Status =3D FileHandleGetSize (InFileHandle, &Temp64Bit);
- ASSERT (Temp64Bit <=3D (UINT32)(-1));
- InSize =3D (UINTN)Temp64Bit;
ASSERT_EFI_ERROR (Status);
- InBuffer =3D AllocateZeroPool (InSize);
+ if (!EFI_ERROR (Status)) {
+ ASSERT (Temp64Bit <=3D (UINT32)(-1));
+ InSize =3D (UINTN)Temp64Bit;
+ InBuffer =3D AllocateZeroPool (InSize);
+ }
+
if (InBuffer =3D=3D NULL) {
Status =3D EFI_OUT_OF_RESOURCES;
} else {
diff --git a/ShellPkg/Library/UefiShellDriver1CommandsLib/Connect.c b/She=
llPkg/Library/UefiShellDriver1CommandsLib/Connect.c
index d7a133c0c5b4..870c5b0d1da7 100644
--- a/ShellPkg/Library/UefiShellDriver1CommandsLib/Connect.c
+++ b/ShellPkg/Library/UefiShellDriver1CommandsLib/Connect.c
@@ -508,9 +508,10 @@ ShellCommandRunConnect (
Count =3D ShellCommandLineGetCount (Package);
=20
if (Param1 !=3D NULL) {
- Status =3D ShellConvertStringToUint64 (Param1, &Intermediate, T=
RUE, FALSE);
- Handle1 =3D ConvertHandleIndexToHandle ((UINTN)Intermediate);
- if (EFI_ERROR (Status)) {
+ Status =3D ShellConvertStringToUint64 (Param1, &Intermediate, TR=
UE, FALSE);
+ if (!EFI_ERROR (Status)) {
+ Handle1 =3D ConvertHandleIndexToHandle ((UINTN)Intermediate);
+ } else {
ShellPrintHiiEx (-1, -1, NULL, STRING_TOKEN (STR_GEN_INV_HANDL=
E), gShellDriver1HiiHandle, L"connect", Param1);
ShellStatus =3D SHELL_INVALID_PARAMETER;
}
@@ -519,9 +520,10 @@ ShellCommandRunConnect (
}
=20
if (Param2 !=3D NULL) {
- Status =3D ShellConvertStringToUint64 (Param2, &Intermediate, T=
RUE, FALSE);
- Handle2 =3D ConvertHandleIndexToHandle ((UINTN)Intermediate);
- if (EFI_ERROR (Status)) {
+ Status =3D ShellConvertStringToUint64 (Param2, &Intermediate, TR=
UE, FALSE);
+ if (!EFI_ERROR (Status)) {
+ Handle2 =3D ConvertHandleIndexToHandle ((UINTN)Intermediate);
+ } else {
ShellPrintHiiEx (-1, -1, NULL, STRING_TOKEN (STR_GEN_INV_HANDL=
E), gShellDriver1HiiHandle, L"connect", Param2);
ShellStatus =3D SHELL_INVALID_PARAMETER;
}
diff --git a/ShellPkg/Library/UefiShellDriver1CommandsLib/Disconnect.c b/=
ShellPkg/Library/UefiShellDriver1CommandsLib/Disconnect.c
index 009ae5282b27..fd49d1f7ceb4 100644
--- a/ShellPkg/Library/UefiShellDriver1CommandsLib/Disconnect.c
+++ b/ShellPkg/Library/UefiShellDriver1CommandsLib/Disconnect.c
@@ -160,12 +160,17 @@ ShellCommandRunDisconnect (
Param1 =3D ShellCommandLineGetRawValue (Package, 1);
Param2 =3D ShellCommandLineGetRawValue (Package, 2);
Param3 =3D ShellCommandLineGetRawValue (Package, 3);
- ShellConvertStringToUint64 (Param1, &Intermediate1, TRUE, FALSE)=
;
- Handle1 =3D Param1 !=3D NULL ? ConvertHandleIndexToHandle ((UINT=
N)Intermediate1) : NULL;
- ShellConvertStringToUint64 (Param2, &Intermediate2, TRUE, FALSE)=
;
- Handle2 =3D Param2 !=3D NULL ? ConvertHandleIndexToHandle ((UINT=
N)Intermediate2) : NULL;
- ShellConvertStringToUint64 (Param3, &Intermediate3, TRUE, FALSE)=
;
- Handle3 =3D Param3 !=3D NULL ? ConvertHandleIndexToHandle ((UINT=
N)Intermediate3) : NULL;
+ if (!EFI_ERROR (ShellConvertStringToUint64 (Param1, &Intermediat=
e1, TRUE, FALSE))) {
+ Handle1 =3D Param1 !=3D NULL ? ConvertHandleIndexToHandle ((UI=
NTN)Intermediate1) : NULL;
+ }
+
+ if (!EFI_ERROR (ShellConvertStringToUint64 (Param2, &Intermediat=
e2, TRUE, FALSE))) {
+ Handle2 =3D Param2 !=3D NULL ? ConvertHandleIndexToHandle ((UI=
NTN)Intermediate2) : NULL;
+ }
+
+ if (!EFI_ERROR (ShellConvertStringToUint64 (Param3, &Intermediat=
e3, TRUE, FALSE))) {
+ Handle3 =3D Param3 !=3D NULL ? ConvertHandleIndexToHandle ((UI=
NTN)Intermediate3) : NULL;
+ }
=20
if ((Param1 !=3D NULL) && (Handle1 =3D=3D NULL)) {
ShellPrintHiiEx (-1, -1, NULL, STRING_TOKEN (STR_GEN_INV_HANDL=
E), gShellDriver1HiiHandle, L"disconnect", Param1);
diff --git a/ShellPkg/Library/UefiShellDriver1CommandsLib/DrvDiag.c b/She=
llPkg/Library/UefiShellDriver1CommandsLib/DrvDiag.c
index c645c9fd6882..8f70d6b6af39 100644
--- a/ShellPkg/Library/UefiShellDriver1CommandsLib/DrvDiag.c
+++ b/ShellPkg/Library/UefiShellDriver1CommandsLib/DrvDiag.c
@@ -438,25 +438,22 @@ ShellCommandRunDrvDiag (
ControllerHandleStr =3D ShellCommandLineGetRawValue (Package, 2);
ChildHandleStr =3D ShellCommandLineGetRawValue (Package, 3);
=20
- if (DriverHandleStr =3D=3D NULL) {
- Handle1 =3D NULL;
- } else {
- ShellConvertStringToUint64 (DriverHandleStr, &Intermediate, TRUE, =
FALSE);
+ if ((DriverHandleStr !=3D NULL) && ShellConvertStringToUint64 (Drive=
rHandleStr, &Intermediate, TRUE, FALSE)) {
Handle1 =3D ConvertHandleIndexToHandle ((UINTN)Intermediate);
+ } else {
+ Handle1 =3D NULL;
}
=20
- if (ControllerHandleStr =3D=3D NULL) {
- Handle2 =3D NULL;
- } else {
- ShellConvertStringToUint64 (ControllerHandleStr, &Intermediate, TR=
UE, FALSE);
+ if ((ControllerHandleStr !=3D NULL) && ShellConvertStringToUint64 (C=
ontrollerHandleStr, &Intermediate, TRUE, FALSE)) {
Handle2 =3D ConvertHandleIndexToHandle ((UINTN)Intermediate);
+ } else {
+ Handle2 =3D NULL;
}
=20
- if (ChildHandleStr =3D=3D NULL) {
- Handle3 =3D NULL;
- } else {
- ShellConvertStringToUint64 (ChildHandleStr, &Intermediate, TRUE, F=
ALSE);
+ if ((ChildHandleStr !=3D NULL) && ShellConvertStringToUint64 (ChildH=
andleStr, &Intermediate, TRUE, FALSE)) {
Handle3 =3D ConvertHandleIndexToHandle ((UINTN)Intermediate);
+ } else {
+ Handle3 =3D NULL;
}
=20
Status =3D DoDiagnostics (
--=20
2.28.0.windows.1