Merge tag 'kvm-ppc-fixes-5.4-1' of git://git.kernel.org/pub/scm/linux/kernel/git...

[linux.git] / net / ipv4 / tcp_diag.c

diff --git a/net/ipv4/tcp_diag.c b/net/ipv4/tcp_diag.c
index a3a386236d93733f5007c3c652ad7617bda87524..549506162ddeca22f6dd87dfe1c5c13cea6e2b69 100644 (file)
--- a/net/ipv4/tcp_diag.c
+++ b/net/ipv4/tcp_diag.c
@@ -26,8 +26,9 @@ static void tcp_diag_get_info(struct sock *sk, struct inet_diag_msg *r,
        } else if (sk->sk_type == SOCK_STREAM) {
                const struct tcp_sock *tp = tcp_sk(sk);
 
-               r->idiag_rqueue = max_t(int, tp->rcv_nxt - tp->copied_seq, 0);
-               r->idiag_wqueue = tp->write_seq - tp->snd_una;
+               r->idiag_rqueue = max_t(int, READ_ONCE(tp->rcv_nxt) -
+                                            READ_ONCE(tp->copied_seq), 0);
+               r->idiag_wqueue = READ_ONCE(tp->write_seq) - tp->snd_una;
        }
        if (info)
                tcp_get_info(sk, info);
@@ -81,13 +82,42 @@ static int tcp_diag_put_md5sig(struct sk_buff *skb,
 }
 #endif
 
+static int tcp_diag_put_ulp(struct sk_buff *skb, struct sock *sk,
+                           const struct tcp_ulp_ops *ulp_ops)
+{
+       struct nlattr *nest;
+       int err;
+
+       nest = nla_nest_start_noflag(skb, INET_DIAG_ULP_INFO);
+       if (!nest)
+               return -EMSGSIZE;
+
+       err = nla_put_string(skb, INET_ULP_INFO_NAME, ulp_ops->name);
+       if (err)
+               goto nla_failure;
+
+       if (ulp_ops->get_info)
+               err = ulp_ops->get_info(sk, skb);
+       if (err)
+               goto nla_failure;
+
+       nla_nest_end(skb, nest);
+       return 0;
+
+nla_failure:
+       nla_nest_cancel(skb, nest);
+       return err;
+}
+
 static int tcp_diag_get_aux(struct sock *sk, bool net_admin,
                            struct sk_buff *skb)
 {
+       struct inet_connection_sock *icsk = inet_csk(sk);
+       int err = 0;
+
 #ifdef CONFIG_TCP_MD5SIG
        if (net_admin) {
                struct tcp_md5sig_info *md5sig;
-               int err = 0;
 
                rcu_read_lock();
                md5sig = rcu_dereference(tcp_sk(sk)->md5sig_info);
@@ -99,11 +129,21 @@ static int tcp_diag_get_aux(struct sock *sk, bool net_admin,
        }
 #endif
 
+       if (net_admin) {
+               const struct tcp_ulp_ops *ulp_ops;
+
+               ulp_ops = icsk->icsk_ulp_ops;
+               if (ulp_ops)
+                       err = tcp_diag_put_ulp(skb, sk, ulp_ops);
+               if (err)
+                       return err;
+       }
        return 0;
 }
 
 static size_t tcp_diag_get_aux_size(struct sock *sk, bool net_admin)
 {
+       struct inet_connection_sock *icsk = inet_csk(sk);
        size_t size = 0;
 
 #ifdef CONFIG_TCP_MD5SIG
@@ -124,6 +164,17 @@ static size_t tcp_diag_get_aux_size(struct sock *sk, bool net_admin)
        }
 #endif
 
+       if (net_admin && sk_fullsock(sk)) {
+               const struct tcp_ulp_ops *ulp_ops;
+
+               ulp_ops = icsk->icsk_ulp_ops;
+               if (ulp_ops) {
+                       size += nla_total_size(0) +
+                               nla_total_size(TCP_ULP_NAME_MAX);
+                       if (ulp_ops->get_info_size)
+                               size += ulp_ops->get_info_size(sk);
+               }
+       }
        return size;
 }