summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDmitry Shmidt <dimitrysh@google.com>2016-04-21 15:44:11 -0700
committerDmitry Shmidt <dimitrysh@google.com>2016-04-21 15:44:11 -0700
commit9826b2ec8383b14a82f9d1d545a8573986c16abe (patch)
treeb85a767d61b3849f0afa22551966f9fb84f7a4be
parent215856823c282d0339acdad8c7f154abc30d1027 (diff)
Revert "net: fix crash in tcp_nuke_addr()"
This reverts commit 08f7c4280cd5efe9e274240c42177f459431bac2.
-rw-r--r--net/ipv4/tcp.c11
1 files changed, 0 insertions, 11 deletions
diff --git a/net/ipv4/tcp.c b/net/ipv4/tcp.c
index 9819762c4a92..9b19742cbf42 100644
--- a/net/ipv4/tcp.c
+++ b/net/ipv4/tcp.c
@@ -3301,19 +3301,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;