D60460.id.diff
No OneTemporary
Actions

Size

637 B

Referenced Files

None

Subscribers

None

D60460.id.diff
View Options

	diff --git a/sys/netinet/tcp_subr.c b/sys/netinet/tcp_subr.c
	--- a/sys/netinet/tcp_subr.c
	+++ b/sys/netinet/tcp_subr.c
	@@ -3804,9 +3804,12 @@
	optlen += PADTCPOLEN(TCPOLEN_SIGNATURE);
	#endif
	if ((tp->t_flags & TF_SACK_PERMIT) && tp->rcv_numsacks > 0) {
	- optlen += TCPOLEN_SACKHDR;
	- optlen += tp->rcv_numsacks * TCPOLEN_SACK;
	- optlen = PADTCPOLEN(optlen);
	+ u_int sackblks;
	+
	+ sackblks = min(tp->rcv_numsacks, (TCP_MAXOLEN - optlen -
	+ PADTCPOLEN(TCPOLEN_SACKHDR)) / TCPOLEN_SACK);
	+ optlen += PADTCPOLEN(TCPOLEN_SACKHDR +
	+ sackblks * TCPOLEN_SACK);
	}
	} else {
	if (tp->t_flags & TF_REQ_TSTMP)