Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net

Lots of conflicts, by happily all cases of overlapping
changes, parallel adds, things of that nature.

Thanks to Stephen Rothwell, Saeed Mahameed, and others
for their guidance in these resolutions.

Signed-off-by: David S. Miller <davem@davemloft.net>

2 files changed, 30 insertions, 19 deletions

diff --git a/net/tipc/socket.c b/net/tipc/socket.c
index 291d6bbe85f4..1217c90a363b 100644
--- a/net/tipc/socket.c
+++ b/net/tipc/socket.c
@@ -889,7 +889,6 @@ static int tipc_send_group_unicast(struct socket *sock, struct msghdr *m,
         DECLARE_SOCKADDR(struct sockaddr_tipc *, dest, m->msg_name);
         int blks = tsk_blocks(GROUP_H_SIZE + dlen);
         struct tipc_sock *tsk = tipc_sk(sk);
-        struct tipc_group *grp = tsk->group;
         struct net *net = sock_net(sk);
         struct tipc_member *mb = NULL;
         u32 node, port;
@@ -903,7 +902,9 @@ static int tipc_send_group_unicast(struct socket *sock, struct msghdr *m,
         /* Block or return if destination link or member is congested */
         rc = tipc_wait_for_cond(sock, &timeout,
                                 !tipc_dest_find(&tsk->cong_links, node, 0) &&
-                                !tipc_group_cong(grp, node, port, blks, &mb));
+                                tsk->group &&
+                                !tipc_group_cong(tsk->group, node, port, blks,
+                                                 &mb));
         if (unlikely(rc))
                 return rc;
 
@@ -933,7 +934,6 @@ static int tipc_send_group_anycast(struct socket *sock, struct msghdr *m,
         struct tipc_sock *tsk = tipc_sk(sk);
         struct list_head *cong_links = &tsk->cong_links;
         int blks = tsk_blocks(GROUP_H_SIZE + dlen);
-        struct tipc_group *grp = tsk->group;
         struct tipc_msg *hdr = &tsk->phdr;
         struct tipc_member *first = NULL;
         struct tipc_member *mbr = NULL;
@@ -950,9 +950,10 @@ static int tipc_send_group_anycast(struct socket *sock, struct msghdr *m,
         type = msg_nametype(hdr);
         inst = dest->addr.name.name.instance;
         scope = msg_lookup_scope(hdr);
-        exclude = tipc_group_exclude(grp);
 
         while (++lookups < 4) {
+                exclude = tipc_group_exclude(tsk->group);
+
                 first = NULL;
 
                 /* Look for a non-congested destination member, if any */
@@ -961,7 +962,8 @@ static int tipc_send_group_anycast(struct socket *sock, struct msghdr *m,
                                                  &dstcnt, exclude, false))
                                 return -EHOSTUNREACH;
                         tipc_dest_pop(&dsts, &node, &port);
-                        cong = tipc_group_cong(grp, node, port, blks, &mbr);
+                        cong = tipc_group_cong(tsk->group, node, port, blks,
+                                               &mbr);
                         if (!cong)
                                 break;
                         if (mbr == first)
@@ -980,7 +982,8 @@ static int tipc_send_group_anycast(struct socket *sock, struct msghdr *m,
                 /* Block or return if destination link or member is congested */
                 rc = tipc_wait_for_cond(sock, &timeout,
                                         !tipc_dest_find(cong_links, node, 0) &&
-                                        !tipc_group_cong(grp, node, port,
+                                        tsk->group &&
+                                        !tipc_group_cong(tsk->group, node, port,
                                                          blks, &mbr));
                 if (unlikely(rc))
                         return rc;
@@ -1015,8 +1018,7 @@ static int tipc_send_group_bcast(struct socket *sock, struct msghdr *m,
         struct sock *sk = sock->sk;
         struct net *net = sock_net(sk);
         struct tipc_sock *tsk = tipc_sk(sk);
-        struct tipc_group *grp = tsk->group;
-        struct tipc_nlist *dsts = tipc_group_dests(grp);
+        struct tipc_nlist *dsts;
         struct tipc_mc_method *method = &tsk->mc_method;
         bool ack = method->mandatory && method->rcast;
         int blks = tsk_blocks(MCAST_H_SIZE + dlen);
@@ -1025,15 +1027,17 @@ static int tipc_send_group_bcast(struct socket *sock, struct msghdr *m,
         struct sk_buff_head pkts;
         int rc = -EHOSTUNREACH;
 
-        if (!dsts->local && !dsts->remote)
-                return -EHOSTUNREACH;
-
         /* Block or return if any destination link or member is congested */
-        rc = tipc_wait_for_cond(sock, &timeout, !tsk->cong_link_cnt &&
-                                !tipc_group_bc_cong(grp, blks));
+        rc = tipc_wait_for_cond(sock, &timeout,
+                                !tsk->cong_link_cnt && tsk->group &&
+                                !tipc_group_bc_cong(tsk->group, blks));
         if (unlikely(rc))
                 return rc;
 
+        dsts = tipc_group_dests(tsk->group);
+        if (!dsts->local && !dsts->remote)
+                return -EHOSTUNREACH;
+
         /* Complete message header */
         if (dest) {
                 msg_set_type(hdr, TIPC_GRP_MCAST_MSG);
@@ -1045,7 +1049,7 @@ static int tipc_send_group_bcast(struct socket *sock, struct msghdr *m,
         msg_set_hdr_sz(hdr, GROUP_H_SIZE);
         msg_set_destport(hdr, 0);
         msg_set_destnode(hdr, 0);
-        msg_set_grp_bc_seqno(hdr, tipc_group_bc_snd_nxt(grp));
+        msg_set_grp_bc_seqno(hdr, tipc_group_bc_snd_nxt(tsk->group));
 
         /* Avoid getting stuck with repeated forced replicasts */
         msg_set_grp_bc_ack_req(hdr, ack);
@@ -2757,11 +2761,15 @@ void tipc_sk_reinit(struct net *net)
                 rhashtable_walk_start(&iter);
 
                 while ((tsk = rhashtable_walk_next(&iter)) && !IS_ERR(tsk)) {
-                        spin_lock_bh(&tsk->sk.sk_lock.slock);
+                        sock_hold(&tsk->sk);
+                        rhashtable_walk_stop(&iter);
+                        lock_sock(&tsk->sk);
                         msg = &tsk->phdr;
                         msg_set_prevnode(msg, tipc_own_addr(net));
                         msg_set_orignode(msg, tipc_own_addr(net));
-                        spin_unlock_bh(&tsk->sk.sk_lock.slock);
+                        release_sock(&tsk->sk);
+                        rhashtable_walk_start(&iter);
+                        sock_put(&tsk->sk);
                 }
 
                 rhashtable_walk_stop(&iter);
diff --git a/net/tipc/udp_media.c b/net/tipc/udp_media.c
index 10dc59ce9c82..4d85d71f16e2 100644
--- a/net/tipc/udp_media.c
+++ b/net/tipc/udp_media.c
@@ -245,10 +245,8 @@ static int tipc_udp_send_msg(struct net *net, struct sk_buff *skb,
                 }
 
                 err = tipc_udp_xmit(net, _skb, ub, src, &rcast->addr);
-                if (err) {
-                        kfree_skb(_skb);
+                if (err)
                         goto out;
-                }
         }
         err = 0;
 out:
@@ -681,6 +679,11 @@ static int tipc_udp_enable(struct net *net, struct tipc_bearer *b,
         if (err)
                 goto err;
 
+        if (remote.proto != local.proto) {
+                err = -EINVAL;
+                goto err;
+        }
+
         /* Checking remote ip address */
         rmcast = tipc_udp_is_mcast_addr(&remote);