2 files changed, 12 insertions, 5 deletions

diff --git a/net/ipv4/tcp.c b/net/ipv4/tcp.c
index 18c64c74f6d5..4f322003835d 100644
--- a/net/ipv4/tcp.c
+++ b/net/ipv4/tcp.c
@@ -2031,8 +2031,13 @@ void tcp_get_info(struct sock *sk, struct tcp_info *info)
         info->tcpi_snd_mss = tp->mss_cache;
         info->tcpi_rcv_mss = icsk->icsk_ack.rcv_mss;
 
-        info->tcpi_unacked = tp->packets_out;
-        info->tcpi_sacked = tp->sacked_out;
+        if (sk->sk_state == TCP_LISTEN) {
+                info->tcpi_unacked = sk->sk_ack_backlog;
+                info->tcpi_sacked = sk->sk_max_ack_backlog;
+        } else {
+                info->tcpi_unacked = tp->packets_out;
+                info->tcpi_sacked = tp->sacked_out;
+        }
         info->tcpi_lost = tp->lost_out;
         info->tcpi_retrans = tp->retrans_out;
         info->tcpi_fackets = tp->fackets_out;
diff --git a/net/ipv4/tcp_diag.c b/net/ipv4/tcp_diag.c
index 57c5f0b10e6c..3904d2158a92 100644
--- a/net/ipv4/tcp_diag.c
+++ b/net/ipv4/tcp_diag.c
@@ -25,11 +25,13 @@ static void tcp_diag_get_info(struct sock *sk, struct inet_diag_msg *r,
         const struct tcp_sock *tp = tcp_sk(sk);
         struct tcp_info *info = _info;
 
-        if (sk->sk_state == TCP_LISTEN)
+        if (sk->sk_state == TCP_LISTEN) {
                 r->idiag_rqueue = sk->sk_ack_backlog;
-        else
+                r->idiag_wqueue = sk->sk_max_ack_backlog;
+        } else {
                 r->idiag_rqueue = tp->rcv_nxt - tp->copied_seq;
-        r->idiag_wqueue = tp->write_seq - tp->snd_una;
+                r->idiag_wqueue = tp->write_seq - tp->snd_una;
+        }
         if (info != NULL)
                 tcp_get_info(sk, info);
 }