sravan/system76-edk2
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

ShellPkg: Update BCFG command for correct use and errors on moving

Browse Source 
Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Jaben Carsey <jaben.carsey@intel.com>
Reviewed-by: Tapan Shah <tapandshah@hp.com>
Reviewed-by: Erik Bjorge <erik.c.bjorge@intel.com>

git-svn-id: https://svn.code.sf.net/p/edk2/code/trunk/edk2@16060 6f19259b-4bc3-4df7-8a09-765794883524
This commit is contained in:
Jaben Carsey
2014-09-04 20:55:29 +00:00
committed by jcarsey
parent 15f8eef784
commit 37a4164af3
2 changed files with 84 additions and 56 deletions
Download Patch File Download Diff File Expand all files Collapse all files

70
ShellPkg/Library/UefiShellDebug1CommandsLib/Bcfg.c
View File

@ -667,23 +667,34 @@ BcfgMoveDebug1(
IN CONST UINT16 *CurrentOrder, IN CONST UINT16 *CurrentOrder,
IN CONST UINTN OrderCount, IN CONST UINTN OrderCount,
IN CONST UINT16 OldLocation, IN CONST UINT16 OldLocation,
IN CONST UINT16 NewLocation IN UINT16 NewLocation
) )
{ {
UINT16 *NewOrder; UINT16 *NewOrder;
EFI_STATUS Status; EFI_STATUS Status;
UINT16 Temp; UINT16 Temp;
NewOrder = AllocateZeroPool(OrderCount*sizeof(CurrentOrder[0])); NewOrder = AllocateCopyPool(OrderCount*sizeof(CurrentOrder[0]), CurrentOrder);
ASSERT(NewOrder != NULL); if (NewOrder == NULL) {
return (SHELL_OUT_OF_RESOURCES);
}
//
// correct the new location
//
if (NewLocation >= OrderCount) {
if (OrderCount > 0) {
NewLocation = (UINT16)OrderCount - 1;
} else {
NewLocation = 0;
}
}
Temp = CurrentOrder[OldLocation]; Temp = CurrentOrder[OldLocation];
CopyMem(NewOrder, CurrentOrder, OrderCount*sizeof(CurrentOrder[0]));
CopyMem(NewOrder+OldLocation, NewOrder+OldLocation+1, (OrderCount - OldLocation - 1)*sizeof(CurrentOrder[0])); CopyMem(NewOrder+OldLocation, NewOrder+OldLocation+1, (OrderCount - OldLocation - 1)*sizeof(CurrentOrder[0]));
CopyMem(NewOrder+NewLocation+1, NewOrder+NewLocation, (OrderCount - NewLocation - 1)*sizeof(CurrentOrder[0])); CopyMem(NewOrder+NewLocation+1, NewOrder+NewLocation, (OrderCount - NewLocation - 1)*sizeof(CurrentOrder[0]));
NewOrder[NewLocation] = Temp; NewOrder[NewLocation] = Temp;
Status = gRT->SetVariable( Status = gRT->SetVariable(
Target == BcfgTargetBootOrder?(CHAR16*)L"BootOrder":(CHAR16*)L"DriverOrder", Target == BcfgTargetBootOrder?(CHAR16*)L"BootOrder":(CHAR16*)L"DriverOrder",
(EFI_GUID*)&gEfiGlobalVariableGuid, (EFI_GUID*)&gEfiGlobalVariableGuid,
@ -1146,6 +1157,7 @@ ShellCommandRunBcfg (
BGFG_OPERATION CurrentOperation; BGFG_OPERATION CurrentOperation;
UINTN Length; UINTN Length;
UINT64 Intermediate; UINT64 Intermediate;
UINT16 Count;
Length = 0; Length = 0;
ProblemParam = NULL; ProblemParam = NULL;
@ -1232,6 +1244,8 @@ ShellCommandRunBcfg (
} }
} }
Count = (UINT16) (Length / sizeof(CurrentOperation.Order[0]));
// //
// large block to read the type of operation and verify parameter types for the info. // large block to read the type of operation and verify parameter types for the info.
// //
@ -1316,8 +1330,8 @@ ShellCommandRunBcfg (
} else { } else {
Status = ShellConvertStringToUint64(CurrentParam, &Intermediate, TRUE, FALSE); Status = ShellConvertStringToUint64(CurrentParam, &Intermediate, TRUE, FALSE);
CurrentOperation.Number1 = (UINT16)Intermediate; CurrentOperation.Number1 = (UINT16)Intermediate;
if (CurrentOperation.Number1 > (Length / sizeof(CurrentOperation.Order[0]))){ if (CurrentOperation.Number1 > Count){
ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_BCFG_NUMB_RANGE), gShellDebug1HiiHandle, Length / sizeof(CurrentOperation.Order[0])); ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_BCFG_NUMB_RANGE), gShellDebug1HiiHandle, Count);
ShellStatus = SHELL_INVALID_PARAMETER; ShellStatus = SHELL_INVALID_PARAMETER;
} }
} }
@ -1334,24 +1348,24 @@ ShellCommandRunBcfg (
} else { } else {
Status = ShellConvertStringToUint64(CurrentParam, &Intermediate, TRUE, FALSE); Status = ShellConvertStringToUint64(CurrentParam, &Intermediate, TRUE, FALSE);
CurrentOperation.Number1 = (UINT16)Intermediate; CurrentOperation.Number1 = (UINT16)Intermediate;
if (CurrentOperation.Number1 > (Length / sizeof(CurrentOperation.Order[0]))){ if (CurrentOperation.Number1 > Count){
ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_BCFG_NUMB_RANGE), gShellDebug1HiiHandle, Length / sizeof(CurrentOperation.Order[0])); ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_BCFG_NUMB_RANGE), gShellDebug1HiiHandle, Count);
ShellStatus = SHELL_INVALID_PARAMETER;
}
CurrentParam = ShellCommandLineGetRawValue(Package, ++ParamNumber);
if (CurrentParam == NULL || !ShellIsHexOrDecimalNumber(CurrentParam, TRUE, FALSE)) {
ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_PROBLEM), gShellDebug1HiiHandle, CurrentParam);
ShellStatus = SHELL_INVALID_PARAMETER; ShellStatus = SHELL_INVALID_PARAMETER;
} else { } else {
Status = ShellConvertStringToUint64(CurrentParam, &Intermediate, TRUE, FALSE); CurrentParam = ShellCommandLineGetRawValue(Package, ++ParamNumber);
CurrentOperation.Number2 = (UINT16)Intermediate; if (CurrentParam == NULL || !ShellIsHexOrDecimalNumber(CurrentParam, TRUE, FALSE)) {
} ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_PROBLEM), gShellDebug1HiiHandle, CurrentParam);
if (CurrentOperation.Number2 == CurrentOperation.Number1 ShellStatus = SHELL_INVALID_PARAMETER;
||CurrentOperation.Number1 > (Length / sizeof(CurrentOperation.Order[0])) } else {
||CurrentOperation.Number2 > (Length / sizeof(CurrentOperation.Order[0])) Status = ShellConvertStringToUint64(CurrentParam, &Intermediate, TRUE, FALSE);
){ CurrentOperation.Number2 = (UINT16)Intermediate;
ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_BCFG_NUMB_RANGE), gShellDebug1HiiHandle, Length / sizeof(CurrentOperation.Order[0])); }
ShellStatus = SHELL_INVALID_PARAMETER; if (CurrentOperation.Number2 == CurrentOperation.Number1
||CurrentOperation.Number2 >= Count
){
ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_BCFG_NUMB_RANGE), gShellDebug1HiiHandle, Count);
ShellStatus = SHELL_INVALID_PARAMETER;
}
} }
} }
} else { } else {
@ -1368,7 +1382,7 @@ ShellCommandRunBcfg (
case BcfgTypeDump: case BcfgTypeDump:
ShellStatus = BcfgDisplayDumpDebug1( ShellStatus = BcfgDisplayDumpDebug1(
CurrentOperation.Target == BcfgTargetBootOrder?L"Boot":L"Driver", CurrentOperation.Target == BcfgTargetBootOrder?L"Boot":L"Driver",
Length / sizeof(CurrentOperation.Order[0]), Count,
CurrentOperation.Order, CurrentOperation.Order,
ShellCommandLineGetFlag(Package, L"-v")); ShellCommandLineGetFlag(Package, L"-v"));
break; break;
@ -1376,7 +1390,7 @@ ShellCommandRunBcfg (
ShellStatus = BcfgMoveDebug1( ShellStatus = BcfgMoveDebug1(
CurrentOperation.Target, CurrentOperation.Target,
CurrentOperation.Order, CurrentOperation.Order,
Length / sizeof(CurrentOperation.Order[0]), Count,
CurrentOperation.Number1, CurrentOperation.Number1,
CurrentOperation.Number2); CurrentOperation.Number2);
break; break;
@ -1384,7 +1398,7 @@ ShellCommandRunBcfg (
ShellStatus = BcfgRemoveDebug1( ShellStatus = BcfgRemoveDebug1(
CurrentOperation.Target, CurrentOperation.Target,
CurrentOperation.Order, CurrentOperation.Order,
Length / sizeof(CurrentOperation.Order[0]), Count,
CurrentOperation.Number1); CurrentOperation.Number1);
break; break;
case BcfgTypeAdd: case BcfgTypeAdd:
@ -1395,7 +1409,7 @@ ShellCommandRunBcfg (
CurrentOperation.FileName, CurrentOperation.FileName,
CurrentOperation.Description==NULL?L"":CurrentOperation.Description, CurrentOperation.Description==NULL?L"":CurrentOperation.Description,
CurrentOperation.Order, CurrentOperation.Order,
Length / sizeof(CurrentOperation.Order[0]), Count,
CurrentOperation.Target, CurrentOperation.Target,
(BOOLEAN)(CurrentOperation.Type == BcfgTypeAddh), (BOOLEAN)(CurrentOperation.Type == BcfgTypeAddh),
(BOOLEAN)(CurrentOperation.Type == BcfgTypeAddp), (BOOLEAN)(CurrentOperation.Type == BcfgTypeAddp),
@ -1405,7 +1419,7 @@ ShellCommandRunBcfg (
ShellStatus = BcfgAddOptDebug1( ShellStatus = BcfgAddOptDebug1(
CurrentOperation.OptData, CurrentOperation.OptData,
CurrentOperation.Order, CurrentOperation.Order,
Length / sizeof(CurrentOperation.Order[0]), Count,
CurrentOperation.Target); CurrentOperation.Target);
break; break;
default: default:

70
ShellPkg/Library/UefiShellInstall1CommandsLib/Bcfg.c
View File

@ -665,23 +665,34 @@ BcfgMoveInstall1(
IN CONST UINT16 *CurrentOrder, IN CONST UINT16 *CurrentOrder,
IN CONST UINTN OrderCount, IN CONST UINTN OrderCount,
IN CONST UINT16 OldLocation, IN CONST UINT16 OldLocation,
IN CONST UINT16 NewLocation IN UINT16 NewLocation
) )
{ {
UINT16 *NewOrder; UINT16 *NewOrder;
EFI_STATUS Status; EFI_STATUS Status;
UINT16 Temp; UINT16 Temp;
NewOrder = AllocateZeroPool(OrderCount*sizeof(CurrentOrder[0])); NewOrder = AllocateCopyPool(OrderCount*sizeof(CurrentOrder[0]), CurrentOrder);
ASSERT(NewOrder != NULL); if (NewOrder == NULL) {
return (SHELL_OUT_OF_RESOURCES);
}
//
// correct the new location
//
if (NewLocation >= OrderCount) {
if (OrderCount > 0) {
NewLocation = (UINT16)OrderCount - 1;
} else {
NewLocation = 0;
}
}
Temp = CurrentOrder[OldLocation]; Temp = CurrentOrder[OldLocation];
CopyMem(NewOrder, CurrentOrder, OrderCount*sizeof(CurrentOrder[0]));
CopyMem(NewOrder+OldLocation, NewOrder+OldLocation+1, (OrderCount - OldLocation - 1)*sizeof(CurrentOrder[0])); CopyMem(NewOrder+OldLocation, NewOrder+OldLocation+1, (OrderCount - OldLocation - 1)*sizeof(CurrentOrder[0]));
CopyMem(NewOrder+NewLocation+1, NewOrder+NewLocation, (OrderCount - NewLocation - 1)*sizeof(CurrentOrder[0])); CopyMem(NewOrder+NewLocation+1, NewOrder+NewLocation, (OrderCount - NewLocation - 1)*sizeof(CurrentOrder[0]));
NewOrder[NewLocation] = Temp; NewOrder[NewLocation] = Temp;
Status = gRT->SetVariable( Status = gRT->SetVariable(
Target == BcfgTargetBootOrder?(CHAR16*)L"BootOrder":(CHAR16*)L"DriverOrder", Target == BcfgTargetBootOrder?(CHAR16*)L"BootOrder":(CHAR16*)L"DriverOrder",
(EFI_GUID*)&gEfiGlobalVariableGuid, (EFI_GUID*)&gEfiGlobalVariableGuid,
@ -1142,6 +1153,7 @@ ShellCommandRunBcfgInstall (
BGFG_OPERATION CurrentOperation; BGFG_OPERATION CurrentOperation;
UINTN Length; UINTN Length;
UINT64 Intermediate; UINT64 Intermediate;
UINT16 Count;
Length = 0; Length = 0;
ProblemParam = NULL; ProblemParam = NULL;
@ -1228,6 +1240,8 @@ ShellCommandRunBcfgInstall (
} }
} }
Count = (UINT16) (Length / sizeof(CurrentOperation.Order[0]));
// //
// large block to read the type of operation and verify parameter types for the info. // large block to read the type of operation and verify parameter types for the info.
// //
@ -1312,8 +1326,8 @@ ShellCommandRunBcfgInstall (
} else { } else {
Status = ShellConvertStringToUint64(CurrentParam, &Intermediate, TRUE, FALSE); Status = ShellConvertStringToUint64(CurrentParam, &Intermediate, TRUE, FALSE);
CurrentOperation.Number1 = (UINT16)Intermediate; CurrentOperation.Number1 = (UINT16)Intermediate;
if (CurrentOperation.Number1 > (Length / sizeof(CurrentOperation.Order[0]))){ if (CurrentOperation.Number1 > Count){
ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_BCFG_NUMB_RANGE), gShellInstall1HiiHandle, Length / sizeof(CurrentOperation.Order[0])); ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_BCFG_NUMB_RANGE), gShellInstall1HiiHandle, Count);
ShellStatus = SHELL_INVALID_PARAMETER; ShellStatus = SHELL_INVALID_PARAMETER;
} }
} }
@ -1330,24 +1344,24 @@ ShellCommandRunBcfgInstall (
} else { } else {
Status = ShellConvertStringToUint64(CurrentParam, &Intermediate, TRUE, FALSE); Status = ShellConvertStringToUint64(CurrentParam, &Intermediate, TRUE, FALSE);
CurrentOperation.Number1 = (UINT16)Intermediate; CurrentOperation.Number1 = (UINT16)Intermediate;
if (CurrentOperation.Number1 > (Length / sizeof(CurrentOperation.Order[0]))){ if (CurrentOperation.Number1 > Count){
ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_BCFG_NUMB_RANGE), gShellInstall1HiiHandle, Length / sizeof(CurrentOperation.Order[0])); ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_BCFG_NUMB_RANGE), gShellInstall1HiiHandle, Count);
ShellStatus = SHELL_INVALID_PARAMETER;
}
CurrentParam = ShellCommandLineGetRawValue(Package, ++ParamNumber);
if (CurrentParam == NULL || !ShellIsHexOrDecimalNumber(CurrentParam, TRUE, FALSE)) {
ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_PROBLEM), gShellInstall1HiiHandle, CurrentParam);
ShellStatus = SHELL_INVALID_PARAMETER; ShellStatus = SHELL_INVALID_PARAMETER;
} else { } else {
Status = ShellConvertStringToUint64(CurrentParam, &Intermediate, TRUE, FALSE); CurrentParam = ShellCommandLineGetRawValue(Package, ++ParamNumber);
CurrentOperation.Number2 = (UINT16)Intermediate; if (CurrentParam == NULL || !ShellIsHexOrDecimalNumber(CurrentParam, TRUE, FALSE)) {
} ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_PROBLEM), gShellInstall1HiiHandle, CurrentParam);
if (CurrentOperation.Number2 == CurrentOperation.Number1 ShellStatus = SHELL_INVALID_PARAMETER;
||CurrentOperation.Number1 > (Length / sizeof(CurrentOperation.Order[0])) } else {
||CurrentOperation.Number2 > (Length / sizeof(CurrentOperation.Order[0])) Status = ShellConvertStringToUint64(CurrentParam, &Intermediate, TRUE, FALSE);
){ CurrentOperation.Number2 = (UINT16)Intermediate;
ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_BCFG_NUMB_RANGE), gShellInstall1HiiHandle, Length / sizeof(CurrentOperation.Order[0])); }
ShellStatus = SHELL_INVALID_PARAMETER; if (CurrentOperation.Number2 == CurrentOperation.Number1
||CurrentOperation.Number2 >= Count
){
ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_BCFG_NUMB_RANGE), gShellInstall1HiiHandle, Count);
ShellStatus = SHELL_INVALID_PARAMETER;
}
} }
} }
} else { } else {
@ -1364,7 +1378,7 @@ ShellCommandRunBcfgInstall (
case BcfgTypeDump: case BcfgTypeDump:
ShellStatus = BcfgDisplayDumpInstall1( ShellStatus = BcfgDisplayDumpInstall1(
CurrentOperation.Target == BcfgTargetBootOrder?L"Boot":L"Driver", CurrentOperation.Target == BcfgTargetBootOrder?L"Boot":L"Driver",
Length / sizeof(CurrentOperation.Order[0]), Count,
CurrentOperation.Order, CurrentOperation.Order,
ShellCommandLineGetFlag(Package, L"-v")); ShellCommandLineGetFlag(Package, L"-v"));
break; break;
@ -1372,7 +1386,7 @@ ShellCommandRunBcfgInstall (
ShellStatus = BcfgMoveInstall1( ShellStatus = BcfgMoveInstall1(
CurrentOperation.Target, CurrentOperation.Target,
CurrentOperation.Order, CurrentOperation.Order,
Length / sizeof(CurrentOperation.Order[0]), Count,
CurrentOperation.Number1, CurrentOperation.Number1,
CurrentOperation.Number2); CurrentOperation.Number2);
break; break;
@ -1380,7 +1394,7 @@ ShellCommandRunBcfgInstall (
ShellStatus = BcfgRemoveInstall1( ShellStatus = BcfgRemoveInstall1(
CurrentOperation.Target, CurrentOperation.Target,
CurrentOperation.Order, CurrentOperation.Order,
Length / sizeof(CurrentOperation.Order[0]), Count,
CurrentOperation.Number1); CurrentOperation.Number1);
break; break;
case BcfgTypeAdd: case BcfgTypeAdd:
@ -1391,7 +1405,7 @@ ShellCommandRunBcfgInstall (
CurrentOperation.FileName, CurrentOperation.FileName,
CurrentOperation.Description==NULL?L"":CurrentOperation.Description, CurrentOperation.Description==NULL?L"":CurrentOperation.Description,
CurrentOperation.Order, CurrentOperation.Order,
Length / sizeof(CurrentOperation.Order[0]), Count,
CurrentOperation.Target, CurrentOperation.Target,
(BOOLEAN)(CurrentOperation.Type == BcfgTypeAddh), (BOOLEAN)(CurrentOperation.Type == BcfgTypeAddh),
(BOOLEAN)(CurrentOperation.Type == BcfgTypeAddp), (BOOLEAN)(CurrentOperation.Type == BcfgTypeAddp),
@ -1401,7 +1415,7 @@ ShellCommandRunBcfgInstall (
ShellStatus = BcfgAddOptInstall1( ShellStatus = BcfgAddOptInstall1(
CurrentOperation.OptData, CurrentOperation.OptData,
CurrentOperation.Order, CurrentOperation.Order,
Length / sizeof(CurrentOperation.Order[0]), Count,
CurrentOperation.Target); CurrentOperation.Target);
break; break;
default: default: