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

MdeModulePke/Mtftp4Dxe: Correct the total received and saved block number.

Browse Source 
The block returned from Mtftp4RemoveBlockNum is not the total received and
saved block number if it works in passive (Slave) mode.

The issue was exposed by the EMS test.

Cc: Ye Ting <ting.ye@intel.com>
Cc: Fu Siyuan <siyuan.fu@intel.com>
Contributed-under: TianoCore Contribution Agreement 1.1
Signed-off-by: Wu Jiaxin <jiaxin.wu@intel.com>
Reviewed-by: Ye Ting <ting.ye@intel.com>
This commit is contained in:
Jiaxin Wu
2018-10-25 15:31:10 +08:00
parent 0cd6452503
commit 9202304c18
5 changed files with 27 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
MdeModulePkg/Universal/Network/Mtftp4Dxe/Mtftp4Impl.h
View File

@@ -126,9 +126,13 @@ struct _MTFTP4_PROTOCOL {
UINT16 WindowSize; UINT16 WindowSize;
// //
// Record the total received block number and the already acked block number. // Record the total received and saved block number.
// //
UINT64 TotalBlock; UINT64 TotalBlock;
//
// Record the acked block number.
//
UINT64 AckedBlock; UINT64 AckedBlock;
// //

16
MdeModulePkg/Universal/Network/Mtftp4Dxe/Mtftp4Rrq.c
View File

@@ -154,6 +154,7 @@ Mtftp4RrqSaveBlock (
UINT16 Block; UINT16 Block;
UINT64 Start; UINT64 Start;
UINT32 DataLen; UINT32 DataLen;
UINT64 BlockCounter;
BOOLEAN Completed; BOOLEAN Completed;
Completed = FALSE; Completed = FALSE;
@@ -174,10 +175,10 @@ Mtftp4RrqSaveBlock (
// Remove this block number from the file hole. If Mtftp4RemoveBlockNum // Remove this block number from the file hole. If Mtftp4RemoveBlockNum
// returns EFI_NOT_FOUND, the block has been saved, don't save it again. // returns EFI_NOT_FOUND, the block has been saved, don't save it again.
// Note that : For bigger files, allowing the block counter to roll over // Note that : For bigger files, allowing the block counter to roll over
// to accept transfers of unlimited size. So TotalBlock is memorised as // to accept transfers of unlimited size. So BlockCounter is memorised as
// continuous block counter. // continuous block counter.
// //
Status = Mtftp4RemoveBlockNum (&Instance->Blocks, Block, Completed, &Instance->TotalBlock); Status = Mtftp4RemoveBlockNum (&Instance->Blocks, Block, Completed, &BlockCounter);
if (Status == EFI_NOT_FOUND) { if (Status == EFI_NOT_FOUND) {
return EFI_SUCCESS; return EFI_SUCCESS;
@@ -200,7 +201,7 @@ Mtftp4RrqSaveBlock (
} }
if (Token->Buffer != NULL) { if (Token->Buffer != NULL) {
Start = MultU64x32 (Instance->TotalBlock - 1, Instance->BlkSize); Start = MultU64x32 (BlockCounter - 1, Instance->BlkSize);
if (Start + DataLen <= Token->BufferSize) { if (Start + DataLen <= Token->BufferSize) {
CopyMem ((UINT8 *) Token->Buffer + Start, Packet->Data.Data, DataLen); CopyMem ((UINT8 *) Token->Buffer + Start, Packet->Data.Data, DataLen);
@@ -271,9 +272,9 @@ Mtftp4RrqHandleData (
ASSERT (Expected >= 0); ASSERT (Expected >= 0);
// //
// If we are active and received an unexpected packet, transmit // If we are active (Master) and received an unexpected packet, transmit
// the ACK for the block we received, then restart receiving the // the ACK for the block we received, then restart receiving the
// expected one. If we are passive, save the block. // expected one. If we are passive (Slave), save the block.
// //
if (Instance->Master && (Expected != BlockNum)) { if (Instance->Master && (Expected != BlockNum)) {
// //
@@ -288,6 +289,11 @@ Mtftp4RrqHandleData (
return Status; return Status;
} }
//
// Record the total received and saved block number.
//
Instance->TotalBlock ++;
// //
// Reset the passive client's timer whenever it received a // Reset the passive client's timer whenever it received a
// valid data packet. // valid data packet.

10
MdeModulePkg/Universal/Network/Mtftp4Dxe/Mtftp4Support.c
View File

@@ -158,8 +158,8 @@ Mtftp4SetLastBlockNum (
@param Head The block range list to remove from @param Head The block range list to remove from
@param Num The block number to remove @param Num The block number to remove
@param Completed Whether Num is the last block number @param Completed Whether Num is the last block number.
@param TotalBlock The continuous block number in all @param BlockCounter The continuous block counter instead of the value after roll-over.
@retval EFI_NOT_FOUND The block number isn't in the block range list @retval EFI_NOT_FOUND The block number isn't in the block range list
@retval EFI_SUCCESS The block number has been removed from the list @retval EFI_SUCCESS The block number has been removed from the list
@@ -171,7 +171,7 @@ Mtftp4RemoveBlockNum (
IN LIST_ENTRY *Head, IN LIST_ENTRY *Head,
IN UINT16 Num, IN UINT16 Num,
IN BOOLEAN Completed, IN BOOLEAN Completed,
OUT UINT64 *TotalBlock OUT UINT64 *BlockCounter
) )
{ {
MTFTP4_BLOCK_RANGE *Range; MTFTP4_BLOCK_RANGE *Range;
@@ -220,10 +220,10 @@ Mtftp4RemoveBlockNum (
// wrap to zero, because this is the simplest to implement. Here we choose // wrap to zero, because this is the simplest to implement. Here we choose
// this solution. // this solution.
// //
*TotalBlock = Num; *BlockCounter = Num;
if (Range->Round > 0) { if (Range->Round > 0) {
*TotalBlock += Range->Bound + MultU64x32 ((UINTN) (Range->Round -1), (UINT32) (Range->Bound + 1)) + 1; *BlockCounter += Range->Bound + MultU64x32 ((UINTN) (Range->Round -1), (UINT32) (Range->Bound + 1)) + 1;
} }
if (Range->Start > Range->Bound) { if (Range->Start > Range->Bound) {

6
MdeModulePkg/Universal/Network/Mtftp4Dxe/Mtftp4Support.h
View File

@@ -92,8 +92,8 @@ Mtftp4SetLastBlockNum (
@param Head The block range list to remove from @param Head The block range list to remove from
@param Num The block number to remove @param Num The block number to remove
@param Completed Wether Num is the last block number @param Completed Whether Num is the last block number.
@param TotalBlock The continuous block number in all @param BlockCounter The continuous block counter instead of the value after roll-over.
@retval EFI_NOT_FOUND The block number isn't in the block range list @retval EFI_NOT_FOUND The block number isn't in the block range list
@retval EFI_SUCCESS The block number has been removed from the list @retval EFI_SUCCESS The block number has been removed from the list
@@ -105,7 +105,7 @@ Mtftp4RemoveBlockNum (
IN LIST_ENTRY *Head, IN LIST_ENTRY *Head,
IN UINT16 Num, IN UINT16 Num,
IN BOOLEAN Completed, IN BOOLEAN Completed,
OUT UINT64 *TotalBlock OUT UINT64 *BlockCounter
); );
/** /**

6
MdeModulePkg/Universal/Network/Mtftp4Dxe/Mtftp4Wrq.c
View File

@@ -149,7 +149,7 @@ Mtftp4WrqHandleAck (
{ {
UINT16 AckNum; UINT16 AckNum;
INTN Expected; INTN Expected;
UINT64 TotalBlock; UINT64 BlockCounter;
*Completed = FALSE; *Completed = FALSE;
AckNum = NTOHS (Packet->Ack.Block[0]); AckNum = NTOHS (Packet->Ack.Block[0]);
@@ -168,9 +168,9 @@ Mtftp4WrqHandleAck (
// //
// Remove the acked block number, if this is the last block number, // Remove the acked block number, if this is the last block number,
// tell the Mtftp4WrqInput to finish the transfer. This is the last // tell the Mtftp4WrqInput to finish the transfer. This is the last
// block number if the block range are empty.. // block number if the block range are empty.
// //
Mtftp4RemoveBlockNum (&Instance->Blocks, AckNum, *Completed,&TotalBlock); Mtftp4RemoveBlockNum (&Instance->Blocks, AckNum, *Completed, &BlockCounter);
Expected = Mtftp4GetNextBlockNum (&Instance->Blocks); Expected = Mtftp4GetNextBlockNum (&Instance->Blocks);