From: Dmitry Shmidt <dimitrysh@google.com>
Date: Thu, 21 Apr 2016 22:44:11 +0000 (-0700)
Subject: Revert "net: fix crash in tcp_nuke_addr()"
X-Git-Tag: firefly_0821_release~176^2~399^2~34
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=cf84d75f72ae87d15b959967c9a0e1b74f686a6f;p=firefly-linux-kernel-4.4.55.git

Revert "net: fix crash in tcp_nuke_addr()"

This reverts commit 08f7c4280cd5efe9e274240c42177f459431bac2.
---

diff --git a/net/ipv4/tcp.c b/net/ipv4/tcp.c
index edd1312ba73d..6c8a77eb6e57 100644
--- a/net/ipv4/tcp.c
+++ b/net/ipv4/tcp.c
@@ -3305,19 +3305,8 @@ restart:
 		sk_nulls_for_each(sk, node, &tcp_hashinfo.ehash[bucket].chain) {
 			struct inet_sock *inet = inet_sk(sk);
 
-			if (sk->sk_state == TCP_TIME_WAIT) {
-				/*
-				 * Sockets that are in TIME_WAIT state are
-				 * instances of lightweight inet_timewait_sock,
-				 * we should simply skip them (or we'll try to
-				 * access non-existing fields and crash).
-				 */
-				continue;
-			}
-
 			if (sysctl_ip_dynaddr && sk->sk_state == TCP_SYN_SENT)
 				continue;
-
 			if (sock_flag(sk, SOCK_DEAD))
 				continue;