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

NetworkPkg/TcpDxe: Check TCP payload for release version.

Browse Source 
TCP payload check is implemented by TcpVerifySegment(), but all the function
calls of TcpVerifySegment() are placed in ASSERT(), which is only valid for
debug version:
  ASSERT (TcpVerifySegment (Nbuf) != 0);

This patch is to enable the check for release version.

Cc: Ye Ting <ting.ye@intel.com>
Cc: Fu Siyuan <siyuan.fu@intel.com>
Cc: Wang Fan <fan.wang@intel.com>
Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Wu Jiaxin <jiaxin.wu@intel.com>
Reviewed-by: Ye Ting <ting.ye@intel.com>
Reviewed-by: Fu Siyuan <siyuan.fu@intel.com>
This commit is contained in:
Jiaxin Wu
2017-12-22 14:53:03 +08:00
parent 9d02c34f04
commit 786a4d1921
2 changed files with 122 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
NetworkPkg/TcpDxe/TcpOutput.c
View File

@@ -292,7 +292,11 @@ TcpTransmitSegment (
BOOLEAN Syn;
UINT32 DataLen;
ASSERT ((Nbuf != NULL) && (Nbuf->Tcp == NULL) && (TcpVerifySegment (Nbuf) != 0));
ASSERT ((Nbuf != NULL) && (Nbuf->Tcp == NULL));
if (TcpVerifySegment (Nbuf) == 0) {
return -1;
}
DataLen = Nbuf->TotalSize;
@@ -634,7 +638,11 @@ TcpGetSegment (
Nbuf = TcpGetSegmentSock (Tcb, Seq, Len);
}
ASSERT (TcpVerifySegment (Nbuf) != 0);
if (TcpVerifySegment (Nbuf) == 0) {
NetbufFree (Nbuf);
return NULL;
}
return Nbuf;
}
@@ -701,7 +709,9 @@ TcpRetransmit (
return -1;
}
ASSERT (TcpVerifySegment (Nbuf) != 0);
if (TcpVerifySegment (Nbuf) == 0) {
goto OnError;
}
if (TcpTransmitSegment (Tcb, Nbuf) != 0) {
goto OnError;
@@ -886,8 +896,14 @@ TcpToSendData (
Seg->End = End;
Seg->Flag = Flag;
ASSERT (TcpVerifySegment (Nbuf) != 0);
ASSERT (TcpCheckSndQue (&Tcb->SndQue) != 0);
if (TcpVerifySegment (Nbuf) == 0 || TcpCheckSndQue (&Tcb->SndQue) == 0) {
DEBUG (
(EFI_D_ERROR,
"TcpToSendData: discard a broken segment for TCB %p\n",
Tcb)
);
goto OnError;
}
//
// Don't send an empty segment here.
@@ -899,8 +915,7 @@ TcpToSendData (
Tcb)
);
NetbufFree (Nbuf);
return Sent;
goto OnError;
}
if (TcpTransmitSegment (Tcb, Nbuf) != 0) {