Revert "net: fix crash in tcp_nuke_addr()"
authorDmitry Shmidt <dimitrysh@google.com>
Thu, 21 Apr 2016 22:44:11 +0000 (15:44 -0700)
committerAmit Pundir <amit.pundir@linaro.org>
Thu, 19 May 2016 07:02:41 +0000 (12:32 +0530)
This reverts commit 08f7c4280cd5efe9e274240c42177f459431bac2.

net/ipv4/tcp.c

index edd1312ba73d7eb3b33fbca08f1c788df3938097..6c8a77eb6e574af43404ad24f5c74cc57d9a6379 100644 (file)
@@ -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;