Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net

Signed-off-by: David S. Miller <davem@davemloft.net>
2018-01-29 10:14:59 -05:00
parent 868c36dcc9 ba804bb4b7
commit 3e3ab9ccca
28 changed files with 346 additions and 220 deletions
--- a/net/ipv4/tcp.c
+++ b/net/ipv4/tcp.c
@ -2322,6 +2322,9 @@ adjudge_to_death:
 			tcp_send_active_reset(sk, GFP_ATOMIC);
 			__NET_INC_STATS(sock_net(sk),
 					LINUX_MIB_TCPABORTONMEMORY);
+		} else if (!check_net(sock_net(sk))) {
+			/* Not possible to send reset; just close */
+			tcp_set_state(sk, TCP_CLOSE);
 		}
 	}