tyler.durden/audk
1
0
Fork 0
mirror of https://github.com/acidanthera/audk.git synced 2025-04-08 17:05:09 +02:00
Code Issues Packages Projects Releases Wiki Activity

ShellPkg: UefiShellCommandLib: CodeQL Fixes

Browse Source 
Includes changes across the module for the following CodeQL rules:
 - cpp/comparison-with-wider-type
 - cpp/overflow-buffer
 - cpp/redundant-null-check-param
 - cpp/uselesstest

Co-authored-by: Taylor Beebe <taylor.d.beebe@gmail.com>

Signed-off-by: Oliver Smith-Denny <osde@linux.microsoft.com>
This commit is contained in:
Oliver Smith-Denny 2024-10-03 10:31:12 -07:00 committed by mergify[bot]
parent 1d64506f05
commit c80c222198
3 changed files with 55 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ShellPkg/Library/UefiShellCommandLib/ConsistMapping.c
View File

@ -1404,6 +1404,10 @@ GetHIDevicePath (
NonHIDevicePathNodeCount = 0;
HIDevicePath = AllocateZeroPool (sizeof (EFI_DEVICE_PATH_PROTOCOL));
if (HIDevicePath == NULL) {
return NULL;
}
SetDevicePathEndNode (HIDevicePath);
Node.DevPath.Type = END_DEVICE_PATH_TYPE;

73
ShellPkg/Library/UefiShellCommandLib/UefiShellCommandLib.c
View File

@ -1142,7 +1142,7 @@ DeleteScriptFileStruct (
IN SCRIPT_FILE *Script
)
{
UINT8 LoopVar;
UINTN LoopVar;
if (Script == NULL) {
return;
@ -1263,6 +1263,10 @@ ShellCommandCreateNewMappingName (
String = NULL;
String = AllocateZeroPool (PcdGet8 (PcdShellMapNameLength) * sizeof (String[0]));
if (String == NULL) {
return (NULL);
}
UnicodeSPrint (
String,
PcdGet8 (PcdShellMapNameLength) * sizeof (String[0]),
@ -1459,29 +1463,39 @@ ShellCommandCreateInitialMappingsAndPaths (
//
PerformQuickSort (DevicePathList, Count, sizeof (EFI_DEVICE_PATH_PROTOCOL *), DevicePathCompare);
if (!EFI_ERROR (ShellCommandConsistMappingInitialize (&ConsistMappingTable))) {
//
// Assign new Mappings to all...
//
for (Count = 0; HandleList[Count] != NULL; Count++) {
//
// Get default name first
//
NewDefaultName = ShellCommandCreateNewMappingName (MappingTypeFileSystem);
ASSERT (NewDefaultName != NULL);
Status = ShellCommandAddMapItemAndUpdatePath (NewDefaultName, DevicePathList[Count], 0, TRUE);
ASSERT_EFI_ERROR (Status);
FreePool (NewDefaultName);
Status = ShellCommandConsistMappingInitialize (&ConsistMappingTable);
if (EFI_ERROR (Status)) {
SHELL_FREE_NON_NULL (HandleList);
SHELL_FREE_NON_NULL (DevicePathList);
return Status;
}
//
// Now do consistent name
//
NewConsistName = ShellCommandConsistMappingGenMappingName (DevicePathList[Count], ConsistMappingTable);
if (NewConsistName != NULL) {
Status = ShellCommandAddMapItemAndUpdatePath (NewConsistName, DevicePathList[Count], 0, FALSE);
ASSERT_EFI_ERROR (Status);
FreePool (NewConsistName);
}
//
// Assign new Mappings to all...
//
for (Count = 0; HandleList[Count] != NULL; Count++) {
//
// Get default name first
//
NewDefaultName = ShellCommandCreateNewMappingName (MappingTypeFileSystem);
if (NewDefaultName == NULL) {
ASSERT (NewDefaultName != NULL);
Status = EFI_OUT_OF_RESOURCES;
break;
}
Status = ShellCommandAddMapItemAndUpdatePath (NewDefaultName, DevicePathList[Count], 0, TRUE);
ASSERT_EFI_ERROR (Status);
FreePool (NewDefaultName);
//
// Now do consistent name
//
NewConsistName = ShellCommandConsistMappingGenMappingName (DevicePathList[Count], ConsistMappingTable);
if (NewConsistName != NULL) {
Status = ShellCommandAddMapItemAndUpdatePath (NewConsistName, DevicePathList[Count], 0, FALSE);
ASSERT_EFI_ERROR (Status);
FreePool (NewConsistName);
}
}
@ -1561,7 +1575,13 @@ ShellCommandCreateInitialMappingsAndPaths (
// Get default name first
//
NewDefaultName = ShellCommandCreateNewMappingName (MappingTypeBlockIo);
ASSERT (NewDefaultName != NULL);
if (NewDefaultName == NULL) {
ASSERT (NewDefaultName != NULL);
SHELL_FREE_NON_NULL (HandleList);
SHELL_FREE_NON_NULL (DevicePathList);
return EFI_OUT_OF_RESOURCES;
}
Status = ShellCommandAddMapItemAndUpdatePath (NewDefaultName, DevicePathList[Count], 0, FALSE);
ASSERT_EFI_ERROR (Status);
FreePool (NewDefaultName);
@ -1631,6 +1651,11 @@ ShellCommandUpdateMapping (
PerformQuickSort (DevicePathList, Count, sizeof (EFI_DEVICE_PATH_PROTOCOL *), DevicePathCompare);
Status = ShellCommandConsistMappingInitialize (&ConsistMappingTable);
if (EFI_ERROR (Status)) {
SHELL_FREE_NON_NULL (HandleList);
SHELL_FREE_NON_NULL (DevicePathList);
return Status;
}
//
// Assign new Mappings to remainders

2
ShellPkg/Library/UefiShellLevel1CommandsLib/For.c
View File

@ -691,6 +691,8 @@ ShellCommandRunFor (
TempString = AllocateZeroPool (50*sizeof (CHAR16));
if (TempString == NULL) {
SHELL_FREE_NON_NULL (ArgSet);
SHELL_FREE_NON_NULL (Info);
return (SHELL_OUT_OF_RESOURCES);
}