tyler.durden/audk
1
0
Fork 0
mirror of https://github.com/acidanthera/audk.git synced 2025-07-31 01:24:12 +02:00
Code Issues Packages Projects Releases Wiki Activity

MdeModulePkg/UsbMass: Fix integer overflow when BlockSize is 1

Browse Source 
UsbBootReadWriteBlocks() and UsbBootReadWriteBlocks16() use a UINT16
local variable to hold the value of
USB_BOOT_MAX_CARRY_SIZE (=0x10000) / BlockSize.
When BlockSize is 1, the UINT16 local variable is set to 0x10000
but the high-16 bits are truncated resulting the final value be 0.

It causes the while-loop in the two functions accesses 0 block in
each loop, resulting the loop never ends.

The patch fixes the two functions to make sure no integer overflow
happens.

Contributed-under: TianoCore Contribution Agreement 1.1
Signed-off-by: Ruiyu Ni <ruiyu.ni@intel.com>
Cc: Star Zeng <star.zeng@intel.com>
Cc: Steven Shi <steven.shi@intel.com>
Reviewed-by: Star Zeng <star.zeng@intel.com>
This commit is contained in:
Ruiyu Ni 2018-09-11 18:13:05 +08:00
parent e59db6a732
commit 4f8b2f9d72
1 changed files with 14 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
MdeModulePkg/Bus/Usb/UsbMassStorageDxe/UsbMassBoot.c
View File

@ -815,14 +815,14 @@ UsbBootReadWriteBlocks (
{ {
USB_BOOT_READ_WRITE_10_CMD Cmd; USB_BOOT_READ_WRITE_10_CMD Cmd;
EFI_STATUS Status; EFI_STATUS Status;
UINT16 Count; UINT32 Count;
UINT16 CountMax; UINT32 CountMax;
UINT32 BlockSize; UINT32 BlockSize;
UINT32 ByteSize; UINT32 ByteSize;
UINT32 Timeout; UINT32 Timeout;
BlockSize = UsbMass->BlockIoMedia.BlockSize; BlockSize = UsbMass->BlockIoMedia.BlockSize;
CountMax = (UINT16)(USB_BOOT_MAX_CARRY_SIZE / BlockSize); CountMax = USB_BOOT_MAX_CARRY_SIZE / BlockSize;
Status = EFI_SUCCESS; Status = EFI_SUCCESS;
while (TotalBlock > 0) { while (TotalBlock > 0) {
@ -831,8 +831,9 @@ UsbBootReadWriteBlocks (
// on the device. We must split the total block because the READ10 // on the device. We must split the total block because the READ10
// command only has 16 bit transfer length (in the unit of block). // command only has 16 bit transfer length (in the unit of block).
// //
Count = (UINT16)((TotalBlock < CountMax) ? TotalBlock : CountMax); Count = (UINT32)MIN (TotalBlock, CountMax);
ByteSize = (UINT32)Count * BlockSize; Count = MIN (MAX_UINT16, Count);
ByteSize = Count * BlockSize;
// //
// USB command's upper limit timeout is 5s. [USB2.0-9.2.6.1] // USB command's upper limit timeout is 5s. [USB2.0-9.2.6.1]
@ -847,7 +848,7 @@ UsbBootReadWriteBlocks (
Cmd.OpCode = Write ? USB_BOOT_WRITE10_OPCODE : USB_BOOT_READ10_OPCODE; Cmd.OpCode = Write ? USB_BOOT_WRITE10_OPCODE : USB_BOOT_READ10_OPCODE;
Cmd.Lun = (UINT8) (USB_BOOT_LUN (UsbMass->Lun)); Cmd.Lun = (UINT8) (USB_BOOT_LUN (UsbMass->Lun));
WriteUnaligned32 ((UINT32 *) Cmd.Lba, SwapBytes32 (Lba)); WriteUnaligned32 ((UINT32 *) Cmd.Lba, SwapBytes32 (Lba));
WriteUnaligned16 ((UINT16 *) Cmd.TransferLen, SwapBytes16 (Count)); WriteUnaligned16 ((UINT16 *) Cmd.TransferLen, SwapBytes16 ((UINT16)Count));
Status = UsbBootExecCmdWithRetry ( Status = UsbBootExecCmdWithRetry (
UsbMass, UsbMass,
@ -867,7 +868,7 @@ UsbBootReadWriteBlocks (
Lba, Count Lba, Count
)); ));
Lba += Count; Lba += Count;
Buffer += Count * BlockSize; Buffer += ByteSize;
TotalBlock -= Count; TotalBlock -= Count;
} }
@ -897,22 +898,22 @@ UsbBootReadWriteBlocks16 (
{ {
UINT8 Cmd[16]; UINT8 Cmd[16];
EFI_STATUS Status; EFI_STATUS Status;
UINT16 Count; UINT32 Count;
UINT16 CountMax; UINT32 CountMax;
UINT32 BlockSize; UINT32 BlockSize;
UINT32 ByteSize; UINT32 ByteSize;
UINT32 Timeout; UINT32 Timeout;
BlockSize = UsbMass->BlockIoMedia.BlockSize; BlockSize = UsbMass->BlockIoMedia.BlockSize;
CountMax = (UINT16)(USB_BOOT_MAX_CARRY_SIZE / BlockSize); CountMax = USB_BOOT_MAX_CARRY_SIZE / BlockSize;
Status = EFI_SUCCESS; Status = EFI_SUCCESS;
while (TotalBlock > 0) { while (TotalBlock > 0) {
// //
// Split the total blocks into smaller pieces. // Split the total blocks into smaller pieces.
// //
Count = (UINT16)((TotalBlock < CountMax) ? TotalBlock : CountMax); Count = (UINT32)MIN (TotalBlock, CountMax);
ByteSize = (UINT32)Count * BlockSize; ByteSize = Count * BlockSize;
// //
// USB command's upper limit timeout is 5s. [USB2.0-9.2.6.1] // USB command's upper limit timeout is 5s. [USB2.0-9.2.6.1]
@ -947,7 +948,7 @@ UsbBootReadWriteBlocks16 (
Lba, Count Lba, Count
)); ));
Lba += Count; Lba += Count;
Buffer += Count * BlockSize; Buffer += ByteSize;
TotalBlock -= Count; TotalBlock -= Count;
} }