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

1. Fix bug in PXE driver UdpRead function to handle the IP fragmentation. 

Signed-off-by: sfu5
Reviewed-by: xdu2
Reviewed-by: hhuan13

git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@12309 6f19259b-4bc3-4df7-8a09-765794883524
This commit is contained in:
sfu5 2011-09-09 08:31:37 +00:00
parent eb2710af5b
commit c3cd46d421
1 changed files with 45 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

59
MdeModulePkg/Universal/Network/UefiPxeBcDxe/PxeBcImpl.c
View File

@ -1631,7 +1631,13 @@ EfiPxeBcUdpRead (
EFI_STATUS Status; EFI_STATUS Status;
BOOLEAN IsDone; BOOLEAN IsDone;
BOOLEAN Matched; BOOLEAN Matched;
UINTN CopyLen; UINTN CopiedLen;
UINTN HeaderLen;
UINTN HeaderCopiedLen;
UINTN BufferCopiedLen;
UINT32 FragmentLength;
UINTN FragmentIndex;
UINT8 *FragmentBuffer;
if (This == NULL || DestIp == NULL || DestPort == NULL) { if (This == NULL || DestIp == NULL || DestPort == NULL) {
return EFI_INVALID_PARAMETER; return EFI_INVALID_PARAMETER;
@ -1788,26 +1794,51 @@ TRY_AGAIN:
} }
if (Matched) { if (Matched) {
ASSERT (RxData != NULL);
CopyLen = 0; HeaderLen = 0;
if (HeaderSize != NULL) { if (HeaderSize != NULL) {
CopyLen = MIN (*HeaderSize, RxData->DataLength); HeaderLen = MIN (*HeaderSize, RxData->DataLength);
CopyMem (HeaderPtr, RxData->FragmentTable[0].FragmentBuffer, CopyLen);
*HeaderSize = CopyLen;
} }
if (RxData->DataLength - CopyLen > *BufferSize) { if (RxData->DataLength - HeaderLen > *BufferSize) {
Status = EFI_BUFFER_TOO_SMALL; Status = EFI_BUFFER_TOO_SMALL;
} else { } else {
*HeaderSize = HeaderLen;
*BufferSize = RxData->DataLength - HeaderLen;
*BufferSize = RxData->DataLength - CopyLen; HeaderCopiedLen = 0;
CopyMem ( BufferCopiedLen = 0;
BufferPtr, for (FragmentIndex = 0; FragmentIndex < RxData->FragmentCount; FragmentIndex++) {
(UINT8 *) RxData->FragmentTable[0].FragmentBuffer + CopyLen, FragmentLength = RxData->FragmentTable[FragmentIndex].FragmentLength;
*BufferSize FragmentBuffer = RxData->FragmentTable[FragmentIndex].FragmentBuffer;
); if (HeaderCopiedLen + FragmentLength < HeaderLen) {
//
// Copy the header part of received data.
//
CopyMem ((UINT8 *) HeaderPtr + HeaderCopiedLen, FragmentBuffer, FragmentLength);
HeaderCopiedLen += FragmentLength;
} else if (HeaderCopiedLen < HeaderLen) {
//
// Copy the header part of received data.
//
CopiedLen = HeaderLen - HeaderCopiedLen;
CopyMem ((UINT8 *) HeaderPtr + HeaderCopiedLen, FragmentBuffer, CopiedLen);
HeaderCopiedLen += CopiedLen;
//
// Copy the other part of received data.
//
CopyMem ((UINT8 *) BufferPtr + BufferCopiedLen, FragmentBuffer + CopiedLen, FragmentLength - CopiedLen);
BufferCopiedLen += (FragmentLength - CopiedLen);
} else {
//
// Copy the other part of received data.
//
CopyMem ((UINT8 *) BufferPtr + BufferCopiedLen, FragmentBuffer, FragmentLength);
BufferCopiedLen += FragmentLength;
}
}
} }
} else { } else {