D51438.id158822.diff
No OneTemporary
Actions

Size

993 B

Referenced Files

None

Subscribers

None

D51438.id158822.diff
View Options

	diff --git a/sys/netinet/tcp_input.c b/sys/netinet/tcp_input.c
	--- a/sys/netinet/tcp_input.c
	+++ b/sys/netinet/tcp_input.c
	@@ -1055,6 +1055,8 @@
	* socket appended to the listen queue in SYN_RECEIVED state.
	*/
	if ((thflags & (TH_RST\|TH_ACK\|TH_SYN)) == TH_ACK) {
	+ int result;
	+
	/*
	* Parse the TCP options here because
	* syncookies need access to the reflected
	@@ -1064,8 +1066,8 @@
	/*
	* NB: syncache_expand() doesn't unlock inp.
	*/
	- rstreason = syncache_expand(&inc, &to, th, &so, m, port);
	- if (rstreason < 0) {
	+ result = syncache_expand(&inc, &to, th, &so, m, port);
	+ if (result < 0) {
	/*
	* A failing TCP MD5 signature comparison
	* must result in the segment being dropped
	@@ -1073,7 +1075,7 @@
	* to the sender.
	*/
	goto dropunlock;
	- } else if (rstreason == 0) {
	+ } else if (result == 0) {
	/*
	* No syncache entry, or ACK was not for our
	* SYN/ACK. Do our protection against double