ipv4: use check_net()

Don't directly acess the namespace count. There's even a dedicated
helper for this.

Reviewed-by: Jan Kara <jack@suse.cz>
Signed-off-by: Christian Brauner <brauner@kernel.org>

diff --git a/net/ipv4/inet_timewait_sock.c b/net/ipv4/inet_timewait_sock.c
index 875ff923a8ed05411628f55f788f33cbe3dee5b3..56a117560c0cbb8ab30cac81889249f7b7cae1d4 100644 (file)
--- a/net/ipv4/inet_timewait_sock.c
+++ b/net/ipv4/inet_timewait_sock.c
@@ -329,13 +329,13 @@ restart:
                                             TCPF_NEW_SYN_RECV))
                                continue;
 
-                       if (refcount_read(&sock_net(sk)->ns.count))
+                       if (check_net(sock_net(sk)))
                                continue;
 
                        if (unlikely(!refcount_inc_not_zero(&sk->sk_refcnt)))
                                continue;
 
-                       if (refcount_read(&sock_net(sk)->ns.count)) {
+                       if (check_net(sock_net(sk))) {
                                sock_gen_put(sk);
                                goto restart;
                        }

diff --git a/net/ipv4/tcp_metrics.c b/net/ipv4/tcp_metrics.c
index 03c068ea27b6ad3283b8365f31706c11ecdd07f2..b67f94c60f9ffcfff7c94b101f18248e5e6ad673 100644 (file)
--- a/net/ipv4/tcp_metrics.c
+++ b/net/ipv4/tcp_metrics.c
@@ -912,7 +912,7 @@ static void tcp_metrics_flush_all(struct net *net)
                spin_lock_bh(&tcp_metrics_lock);
                for (tm = deref_locked(*pp); tm; tm = deref_locked(*pp)) {
                        match = net ? net_eq(tm_net(tm), net) :
-                               !refcount_read(&tm_net(tm)->ns.count);
+                               !check_net(tm_net(tm));
                        if (match) {
                                rcu_assign_pointer(*pp, tm->tcpm_next);
                                kfree_rcu(tm, rcu_head);