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

ShellPkg: Fix LastError environment variable truncation

Browse Source 
-Fixes LastError environment variable being truncated to 32 bits on 64 bit systems
-Fixes possible buffer overrun issue with LastError string value

Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Robert Matthews <robert.matthews@hp.com>
Reviewed-by: Jaben Carsey <Jaben.carsey@intel.com>

git-svn-id: https://svn.code.sf.net/p/edk2/code/trunk/edk2@14608 6f19259b-4bc3-4df7-8a09-765794883524
This commit is contained in:
Robert Matthews
2013-08-28 14:38:13 +00:00
committed by jcarsey
parent db44ea6c4e
commit ed34da4007
1 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
ShellPkg/Application/Shell/Shell.c
View File

@ -2,6 +2,7 @@
This is THE shell (application) This is THE shell (application)
Copyright (c) 2009 - 2013, Intel Corporation. All rights reserved.<BR> Copyright (c) 2009 - 2013, Intel Corporation. All rights reserved.<BR>
Copyright (c) 2013, Hewlett-Packard Development Company, L.P.
This program and the accompanying materials This program and the accompanying materials
are licensed and made available under the terms and conditions of the BSD License are licensed and made available under the terms and conditions of the BSD License
which accompanies this distribution. The full text of the license may be found at which accompanies this distribution. The full text of the license may be found at
@ -1359,7 +1360,7 @@ RunCommand(
UINTN Argc; UINTN Argc;
CHAR16 **Argv; CHAR16 **Argv;
BOOLEAN LastError; BOOLEAN LastError;
CHAR16 LeString[11]; CHAR16 LeString[19];
CHAR16 *PostAliasCmdLine; CHAR16 *PostAliasCmdLine;
UINTN PostAliasSize; UINTN PostAliasSize;
CHAR16 *PostVariableCmdLine; CHAR16 *PostVariableCmdLine;
@ -1556,7 +1557,7 @@ RunCommand(
if (!EFI_ERROR(Status)) { if (!EFI_ERROR(Status)) {
Status = ShellCommandRunCommandHandler(ShellInfoObject.NewShellParametersProtocol->Argv[0], &ShellStatus, &LastError); Status = ShellCommandRunCommandHandler(ShellInfoObject.NewShellParametersProtocol->Argv[0], &ShellStatus, &LastError);
ASSERT_EFI_ERROR(Status); ASSERT_EFI_ERROR(Status);
UnicodeSPrint(LeString, sizeof(LeString)*sizeof(LeString[0]), L"0x%08x", ShellStatus); UnicodeSPrint(LeString, sizeof(LeString), L"0x%08Lx", ShellStatus);
DEBUG_CODE(InternalEfiShellSetEnv(L"DebugLasterror", LeString, TRUE);); DEBUG_CODE(InternalEfiShellSetEnv(L"DebugLasterror", LeString, TRUE););
if (LastError) { if (LastError) {
InternalEfiShellSetEnv(L"Lasterror", LeString, TRUE); InternalEfiShellSetEnv(L"Lasterror", LeString, TRUE);
@ -1607,7 +1608,7 @@ RunCommand(
// //
// Updatet last error status. // Updatet last error status.
// //
UnicodeSPrint(LeString, sizeof(LeString)*sizeof(LeString[0]), L"0x%08x", StatusCode); UnicodeSPrint(LeString, sizeof(LeString), L"0x%08Lx", StatusCode);
DEBUG_CODE(InternalEfiShellSetEnv(L"DebugLasterror", LeString, TRUE);); DEBUG_CODE(InternalEfiShellSetEnv(L"DebugLasterror", LeString, TRUE););
InternalEfiShellSetEnv(L"Lasterror", LeString, TRUE); InternalEfiShellSetEnv(L"Lasterror", LeString, TRUE);
} }
@ -1909,7 +1910,7 @@ RunScriptFileHandle (
} }
if (ShellCommandGetScriptExit()) { if (ShellCommandGetScriptExit()) {
UnicodeSPrint(LeString, sizeof(LeString)*sizeof(LeString[0]), L"0x%Lx", ShellCommandGetExitCode()); UnicodeSPrint(LeString, sizeof(LeString), L"0x%Lx", ShellCommandGetExitCode());
DEBUG_CODE(InternalEfiShellSetEnv(L"DebugLasterror", LeString, TRUE);); DEBUG_CODE(InternalEfiShellSetEnv(L"DebugLasterror", LeString, TRUE););
InternalEfiShellSetEnv(L"Lasterror", LeString, TRUE); InternalEfiShellSetEnv(L"Lasterror", LeString, TRUE);