tyler.durden
/
audk
mirror of https://github.com/acidanthera/audk.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

ShellPkg/dblk: Honor the BlockIo alignment requirement. 

Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Huajing Li <huajing.li@intel.com>
Reviewed-by: Ruiyu Ni <ruiyu.ni@intel.com>
This commit is contained in:
HuajingLi 2017-08-01 12:30:18 +08:00 committed by Ruiyu Ni
parent 91ec57c448
commit f11a7a5552
1 changed files with 12 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
ShellPkg/Library/UefiShellDebug1CommandsLib/Dblk.c
View File

@ -2,7 +2,7 @@
Main file for Dblk shell Debug1 function. Main file for Dblk shell Debug1 function.
(C) Copyright 2015 Hewlett-Packard Development Company, L.P.<BR> (C) Copyright 2015 Hewlett-Packard Development Company, L.P.<BR>
Copyright (c) 2005 - 2011, Intel Corporation. All rights reserved.<BR> Copyright (c) 2005 - 2017, Intel Corporation. All rights reserved.<BR>
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
@ -37,6 +37,7 @@ DisplayTheBlocks(
EFI_STATUS Status; EFI_STATUS Status;
SHELL_STATUS ShellStatus; SHELL_STATUS ShellStatus;
UINT8 *Buffer; UINT8 *Buffer;
UINT8 *OriginalBuffer;
UINTN BufferSize; UINTN BufferSize;
ShellStatus = SHELL_SUCCESS; ShellStatus = SHELL_SUCCESS;
@ -52,11 +53,17 @@ DisplayTheBlocks(
} }
BufferSize = BlockIo->Media->BlockSize * BlockCount; BufferSize = BlockIo->Media->BlockSize * BlockCount;
if(BlockIo->Media->IoAlign == 0) {
BlockIo->Media->IoAlign = 1;
}
if (BufferSize > 0) { if (BufferSize > 0) {
Buffer = AllocateZeroPool(BufferSize); OriginalBuffer = AllocateZeroPool(BufferSize + BlockIo->Media->IoAlign);
Buffer = ALIGN_POINTER (OriginalBuffer,BlockIo->Media->IoAlign);
} else { } else {
ShellPrintEx(-1,-1,L" BlockSize: 0x%08x, BlockCount: 0x%08x\r\n", BlockIo->Media->BlockSize, BlockCount); ShellPrintEx(-1,-1,L" BlockSize: 0x%08x, BlockCount: 0x%08x\r\n", BlockIo->Media->BlockSize, BlockCount);
Buffer = NULL; OriginalBuffer = NULL;
Buffer = NULL;
} }
Status = BlockIo->ReadBlocks(BlockIo, BlockIo->Media->MediaId, Lba, BufferSize, Buffer); Status = BlockIo->ReadBlocks(BlockIo, BlockIo->Media->MediaId, Lba, BufferSize, Buffer);
@ -78,8 +85,8 @@ DisplayTheBlocks(
ShellStatus = SHELL_DEVICE_ERROR; ShellStatus = SHELL_DEVICE_ERROR;
} }
if (Buffer != NULL) { if (OriginalBuffer != NULL) {
FreePool(Buffer); FreePool (OriginalBuffer);
} }
gBS->CloseProtocol(BlockIoHandle, &gEfiBlockIoProtocolGuid, gImageHandle, NULL); gBS->CloseProtocol(BlockIoHandle, &gEfiBlockIoProtocolGuid, gImageHandle, NULL);