summaryrefslogtreecommitdiffstats
path: root/ShellPkg
diff options
context:
space:
mode:
authorMeenakshi Aggarwal <meenakshi.aggarwal@nxp.com>2017-09-25 20:05:11 +0530
committerRuiyu Ni <ruiyu.ni@intel.com>2017-10-24 13:48:48 +0800
commit34cd44d4dea2ac5bba88515ed11beb5e61bf37ea (patch)
tree617d27d9d5aff0284e0c1cfe618bf1fafc143de3 /ShellPkg
parentc13cb4aebf4a27dd056f3a4b36d18646ffccef3b (diff)
downloadedk2-34cd44d4dea2ac5bba88515ed11beb5e61bf37ea.tar.gz
edk2-34cd44d4dea2ac5bba88515ed11beb5e61bf37ea.tar.bz2
edk2-34cd44d4dea2ac5bba88515ed11beb5e61bf37ea.zip
TFTP : tftp fix for full volume case
Issue : When storage media is full, tftp was resulting in ASSERT MdeModulePkg/Core/Dxe/Mem/Page.c, because number of pages was zero. Reason: While doing tftp, function call ShellWriteFile was modifying FileSize variable. In case of full disk it was coming out to be Zero. Fix: Storage the original filesize in local variable, and use this variable while freeing the pages. Contributed-under: TianoCore Contribution Agreement 1.1 Signed-off-by: Udit Kumar <udit.kumar@nxp.com> Signed-off-by: Meenakshi Aggarwal <meenakshi.aggarwal@nxp.com> Signed-off-by: Vabhav Sharma <vabhav.sharma@nxp.com> Reviewed-by: Jaben Carsey <jaben.carsey@intel.com> Reviewed-by: Ruiyu Ni <ruiyu.ni@intel.com>
Diffstat (limited to 'ShellPkg')
-rwxr-xr-xShellPkg/Library/UefiShellTftpCommandLib/Tftp.c5
1 files changed, 4 insertions, 1 deletions
diff --git a/ShellPkg/Library/UefiShellTftpCommandLib/Tftp.c b/ShellPkg/Library/UefiShellTftpCommandLib/Tftp.c
index 5c50797631..fbde3bfe60 100755
--- a/ShellPkg/Library/UefiShellTftpCommandLib/Tftp.c
+++ b/ShellPkg/Library/UefiShellTftpCommandLib/Tftp.c
@@ -284,6 +284,7 @@ ShellCommandRunTftp (
EFI_HANDLE Mtftp4ChildHandle;
EFI_MTFTP4_PROTOCOL *Mtftp4;
UINTN FileSize;
+ UINTN DataSize;
VOID *Data;
SHELL_FILE_HANDLE FileHandle;
UINT16 BlockSize;
@@ -294,6 +295,7 @@ ShellCommandRunTftp (
AsciiRemoteFilePath = NULL;
Handles = NULL;
FileSize = 0;
+ DataSize = 0;
BlockSize = MTFTP_DEFAULT_BLKSIZE;
//
@@ -537,6 +539,7 @@ ShellCommandRunTftp (
goto NextHandle;
}
+ DataSize = FileSize;
Status = ShellWriteFile (FileHandle, &FileSize, Data);
if (!EFI_ERROR (Status)) {
ShellStatus = SHELL_SUCCESS;
@@ -551,7 +554,7 @@ ShellCommandRunTftp (
NextHandle:
if (Data != NULL) {
- gBS->FreePages ((EFI_PHYSICAL_ADDRESS)(UINTN)Data, EFI_SIZE_TO_PAGES (FileSize));
+ gBS->FreePages ((EFI_PHYSICAL_ADDRESS)(UINTN)Data, EFI_SIZE_TO_PAGES (DataSize));
}
CloseProtocolAndDestroyServiceChild (