1 files changed, 61 insertions, 27 deletions

diff --git a/net/tipc/socket.c b/net/tipc/socket.c
index c1e93c9515bc..b6f99b021d09 100644
--- a/net/tipc/socket.c
+++ b/net/tipc/socket.c
@@ -576,6 +576,7 @@ static int tipc_release(struct socket *sock)
         sk_stop_timer(sk, &sk->sk_timer);
         tipc_sk_remove(tsk);
 
+        sock_orphan(sk);
         /* Reject any messages that accumulated in backlog queue */
         release_sock(sk);
         tipc_dest_list_purge(&tsk->cong_links);
@@ -1418,8 +1419,10 @@ static int __tipc_sendstream(struct socket *sock, struct msghdr *m, size_t dlen)
         /* Handle implicit connection setup */
         if (unlikely(dest)) {
                 rc = __tipc_sendmsg(sock, m, dlen);
-                if (dlen && (dlen == rc))
+                if (dlen && dlen == rc) {
+                        tsk->peer_caps = tipc_node_get_capabilities(net, dnode);
                         tsk->snt_unacked = tsk_inc(tsk, dlen + msg_hdr_sz(hdr));
+                }
                 return rc;
         }
 
@@ -2672,6 +2675,8 @@ void tipc_sk_reinit(struct net *net)
 
                 rhashtable_walk_stop(&iter);
         } while (tsk == ERR_PTR(-EAGAIN));
+
+        rhashtable_walk_exit(&iter);
 }
 
 static struct tipc_sock *tipc_sk_lookup(struct net *net, u32 portid)
@@ -3227,45 +3232,74 @@ int tipc_nl_sk_walk(struct sk_buff *skb, struct netlink_callback *cb,
                                        struct netlink_callback *cb,
                                        struct tipc_sock *tsk))
 {
-        struct net *net = sock_net(skb->sk);
-        struct tipc_net *tn = tipc_net(net);
-        const struct bucket_table *tbl;
-        u32 prev_portid = cb->args[1];
-        u32 tbl_id = cb->args[0];
-        struct rhash_head *pos;
+        struct rhashtable_iter *iter = (void *)cb->args[4];
         struct tipc_sock *tsk;
         int err;
 
-        rcu_read_lock();
-        tbl = rht_dereference_rcu((&tn->sk_rht)->tbl, &tn->sk_rht);
-        for (; tbl_id < tbl->size; tbl_id++) {
-                rht_for_each_entry_rcu(tsk, pos, tbl, tbl_id, node) {
-                        spin_lock_bh(&tsk->sk.sk_lock.slock);
-                        if (prev_portid && prev_portid != tsk->portid) {
-                                spin_unlock_bh(&tsk->sk.sk_lock.slock);
+        rhashtable_walk_start(iter);
+        while ((tsk = rhashtable_walk_next(iter)) != NULL) {
+                if (IS_ERR(tsk)) {
+                        err = PTR_ERR(tsk);
+                        if (err == -EAGAIN) {
+                                err = 0;
                                 continue;
                         }
+                        break;
+                }
 
-                        err = skb_handler(skb, cb, tsk);
-                        if (err) {
-                                prev_portid = tsk->portid;
-                                spin_unlock_bh(&tsk->sk.sk_lock.slock);
-                                goto out;
-                        }
-
-                        prev_portid = 0;
-                        spin_unlock_bh(&tsk->sk.sk_lock.slock);
+                sock_hold(&tsk->sk);
+                rhashtable_walk_stop(iter);
+                lock_sock(&tsk->sk);
+                err = skb_handler(skb, cb, tsk);
+                if (err) {
+                        release_sock(&tsk->sk);
+                        sock_put(&tsk->sk);
+                        goto out;
                 }
+                release_sock(&tsk->sk);
+                rhashtable_walk_start(iter);
+                sock_put(&tsk->sk);
         }
+        rhashtable_walk_stop(iter);
 out:
-        rcu_read_unlock();
-        cb->args[0] = tbl_id;
-        cb->args[1] = prev_portid;
-
         return skb->len;
 }
 EXPORT_SYMBOL(tipc_nl_sk_walk);
 
+int tipc_dump_start(struct netlink_callback *cb)
+{
+        return __tipc_dump_start(cb, sock_net(cb->skb->sk));
+}
+EXPORT_SYMBOL(tipc_dump_start);
+
+int __tipc_dump_start(struct netlink_callback *cb, struct net *net)
+{
+        /* tipc_nl_name_table_dump() uses cb->args[0...3]. */
+        struct rhashtable_iter *iter = (void *)cb->args[4];
+        struct tipc_net *tn = tipc_net(net);
+
+        if (!iter) {
+                iter = kmalloc(sizeof(*iter), GFP_KERNEL);
+                if (!iter)
+                        return -ENOMEM;
+
+                cb->args[4] = (long)iter;
+        }
+
+        rhashtable_walk_enter(&tn->sk_rht, iter);
+        return 0;
+}
+
+int tipc_dump_done(struct netlink_callback *cb)
+{
+        struct rhashtable_iter *hti = (void *)cb->args[4];
+
+        rhashtable_walk_exit(hti);
+        kfree(hti);
+        return 0;
+}
+EXPORT_SYMBOL(tipc_dump_done);
+
 int tipc_sk_fill_sock_diag(struct sk_buff *skb, struct netlink_callback *cb,
                            struct tipc_sock *tsk, u32 sk_filter_state,
                            u64 (*tipc_diag_gen_cookie)(struct sock *sk))