1 files changed, 3 insertions, 1 deletions

diff --git a/net/ipv4/inet_diag.c b/net/ipv4/inet_diag.c
index 31cf54d18221..45dbdab915e2 100644
--- a/net/ipv4/inet_diag.c
+++ b/net/ipv4/inet_diag.c
@@ -961,7 +961,7 @@ next_normal:
                         ++num;
                 }
 
-                if (r->idiag_states & TCPF_TIME_WAIT) {
+                if (r->idiag_states & (TCPF_TIME_WAIT | TCPF_FIN_WAIT2)) {
                         struct inet_timewait_sock *tw;
 
                         inet_twsk_for_each(tw, node,
@@ -971,6 +971,8 @@ next_normal:
 
                                 if (num < s_num)
                                         goto next_dying;
+                                if (!(r->idiag_states & (1 << tw->tw_substate)))
+                                        goto next_dying;
                                 if (r->sdiag_family != AF_UNSPEC &&
                                                 tw->tw_family != r->sdiag_family)
                                         goto next_dying;