6 files changed, 36 insertions, 30 deletions

diff --git a/net/tipc/bearer.c b/net/tipc/bearer.c
index a7a36779b9b3..327011fcc407 100644
--- a/net/tipc/bearer.c
+++ b/net/tipc/bearer.c
@@ -119,7 +119,7 @@ int  tipc_register_media(u32 media_type,
                 warn("Media <%s> rejected, no broadcast address\n", name);
                 goto exit;
         }
-        if ((bearer_priority < TIPC_MIN_LINK_PRI) &&
+        if ((bearer_priority < TIPC_MIN_LINK_PRI) ||
             (bearer_priority > TIPC_MAX_LINK_PRI)) {
                 warn("Media <%s> rejected, illegal priority (%u)\n", name,
                      bearer_priority);
diff --git a/net/tipc/cluster.c b/net/tipc/cluster.c
index 689fdefe9d04..a7eac00cd363 100644
--- a/net/tipc/cluster.c
+++ b/net/tipc/cluster.c
@@ -437,11 +437,11 @@ void tipc_cltr_recv_routing_table(struct sk_buff *buf)
                 break;
         case ROUTE_ADDITION:
                 if (!is_slave(tipc_own_addr)) {
-                        assert(!in_own_cluster(c_ptr->addr)
-                               || is_slave(rem_node));
+                        assert(!in_own_cluster(c_ptr->addr) ||
+                               is_slave(rem_node));
                 } else {
-                        assert(in_own_cluster(c_ptr->addr)
-                               && !is_slave(rem_node));
+                        assert(in_own_cluster(c_ptr->addr) &&
+                               !is_slave(rem_node));
                 }
                 n_ptr = c_ptr->nodes[tipc_node(rem_node)];
                 if (!n_ptr)
@@ -451,11 +451,11 @@ void tipc_cltr_recv_routing_table(struct sk_buff *buf)
                 break;
         case ROUTE_REMOVAL:
                 if (!is_slave(tipc_own_addr)) {
-                        assert(!in_own_cluster(c_ptr->addr)
-                               || is_slave(rem_node));
+                        assert(!in_own_cluster(c_ptr->addr) ||
+                               is_slave(rem_node));
                 } else {
-                        assert(in_own_cluster(c_ptr->addr)
-                               && !is_slave(rem_node));
+                        assert(in_own_cluster(c_ptr->addr) &&
+                               !is_slave(rem_node));
                 }
                 n_ptr = c_ptr->nodes[tipc_node(rem_node)];
                 if (n_ptr)
diff --git a/net/tipc/link.c b/net/tipc/link.c
index dd4c18b9a35b..6f50f6423f63 100644
--- a/net/tipc/link.c
+++ b/net/tipc/link.c
@@ -378,8 +378,8 @@ static void link_timeout(struct link *l_ptr)
                 struct tipc_msg *msg = buf_msg(l_ptr->first_out);
                 u32 length = msg_size(msg);
 
-                if ((msg_user(msg) == MSG_FRAGMENTER)
-                    && (msg_type(msg) == FIRST_FRAGMENT)) {
+                if ((msg_user(msg) == MSG_FRAGMENTER) &&
+                    (msg_type(msg) == FIRST_FRAGMENT)) {
                         length = msg_size(msg_get_wrapped(msg));
                 }
                 if (length) {
@@ -2788,8 +2788,8 @@ int tipc_link_recv_fragment(struct sk_buff **pending, struct sk_buff **fb,
 
         /* Is there an incomplete message waiting for this fragment? */
 
-        while (pbuf && ((msg_seqno(buf_msg(pbuf)) != long_msg_seq_no)
-                        || (msg_orignode(fragm) != msg_orignode(buf_msg(pbuf))))) {
+        while (pbuf && ((msg_seqno(buf_msg(pbuf)) != long_msg_seq_no) ||
+                        (msg_orignode(fragm) != msg_orignode(buf_msg(pbuf))))) {
                 prev = pbuf;
                 pbuf = pbuf->next;
         }
@@ -3325,8 +3325,8 @@ static void link_print(struct link *l_ptr, struct print_buf *buf,
                                       (l_ptr->last_out)), l_ptr->out_queue_size);
                 if ((mod(msg_seqno(buf_msg(l_ptr->last_out)) -
                          msg_seqno(buf_msg(l_ptr->first_out)))
-                     != (l_ptr->out_queue_size - 1))
-                    || (l_ptr->last_out->next != NULL)) {
+                     != (l_ptr->out_queue_size - 1)) ||
+                    (l_ptr->last_out->next != NULL)) {
                         tipc_printf(buf, "\nSend queue inconsistency\n");
                         tipc_printf(buf, "first_out= %x ", l_ptr->first_out);
                         tipc_printf(buf, "next_out= %x ", l_ptr->next_out);
diff --git a/net/tipc/netlink.c b/net/tipc/netlink.c
index 3c57005e44d1..7bda8e3d1398 100644
--- a/net/tipc/netlink.c
+++ b/net/tipc/netlink.c
@@ -62,7 +62,7 @@ static int handle_cmd(struct sk_buff *skb, struct genl_info *info)
                 rep_nlh = nlmsg_hdr(rep_buf);
                 memcpy(rep_nlh, req_nlh, hdr_space);
                 rep_nlh->nlmsg_len = rep_buf->len;
-                genlmsg_unicast(rep_buf, NETLINK_CB(skb).pid);
+                genlmsg_unicast(&init_net, rep_buf, NETLINK_CB(skb).pid);
         }
 
         return 0;
diff --git a/net/tipc/socket.c b/net/tipc/socket.c
index 1848693ebb82..1ea64f09cc45 100644
--- a/net/tipc/socket.c
+++ b/net/tipc/socket.c
@@ -177,6 +177,7 @@ static void reject_rx_queue(struct sock *sk)
  * @net: network namespace (must be default network)
  * @sock: pre-allocated socket structure
  * @protocol: protocol indicator (must be 0)
+ * @kern: caused by kernel or by userspace?
  *
  * This routine creates additional data structures used by the TIPC socket,
  * initializes them, and links them together.
@@ -184,7 +185,8 @@ static void reject_rx_queue(struct sock *sk)
  * Returns 0 on success, errno otherwise
  */
 
-static int tipc_create(struct net *net, struct socket *sock, int protocol)
+static int tipc_create(struct net *net, struct socket *sock, int protocol,
+                       int kern)
 {
         const struct proto_ops *ops;
         socket_state state;
@@ -193,7 +195,7 @@ static int tipc_create(struct net *net, struct socket *sock, int protocol)
 
         /* Validate arguments */
 
-        if (net != &init_net)
+        if (!net_eq(net, &init_net))
                 return -EAFNOSUPPORT;
 
         if (unlikely(protocol != 0))
@@ -1134,13 +1136,11 @@ restart:
 
         /* Loop around if more data is required */
 
-        if ((sz_copied < buf_len)    /* didn't get all requested data */
-            && (!skb_queue_empty(&sk->sk_receive_queue) ||
-                (flags & MSG_WAITALL))
-                                     /* ... and more is ready or required */
-            && (!(flags & MSG_PEEK)) /* ... and aren't just peeking at data */
-            && (!err)                /* ... and haven't reached a FIN */
-            )
+        if ((sz_copied < buf_len) &&    /* didn't get all requested data */
+            (!skb_queue_empty(&sk->sk_receive_queue) ||
+             (flags & MSG_WAITALL)) &&  /* and more is ready or required */
+            (!(flags & MSG_PEEK)) &&    /* and aren't just peeking at data */
+            (!err))                     /* and haven't reached a FIN */
                 goto restart;
 
 exit:
@@ -1528,7 +1528,7 @@ static int accept(struct socket *sock, struct socket *new_sock, int flags)
 
         buf = skb_peek(&sk->sk_receive_queue);
 
-        res = tipc_create(sock_net(sock->sk), new_sock, 0);
+        res = tipc_create(sock_net(sock->sk), new_sock, 0, 0);
         if (!res) {
                 struct sock *new_sk = new_sock->sk;
                 struct tipc_sock *new_tsock = tipc_sk(new_sk);
@@ -1658,7 +1658,7 @@ restart:
  */
 
 static int setsockopt(struct socket *sock,
-                      int lvl, int opt, char __user *ov, int ol)
+                      int lvl, int opt, char __user *ov, unsigned int ol)
 {
         struct sock *sk = sock->sk;
         struct tipc_port *tport = tipc_sk_port(sk);
@@ -1748,6 +1748,12 @@ static int getsockopt(struct socket *sock,
                 value = jiffies_to_msecs(sk->sk_rcvtimeo);
                 /* no need to set "res", since already 0 at this point */
                 break;
+         case TIPC_NODE_RECVQ_DEPTH:
+                value = (u32)atomic_read(&tipc_queue_size);
+                break;
+         case TIPC_SOCK_RECVQ_DEPTH:
+                value = skb_queue_len(&sk->sk_receive_queue);
+                break;
         default:
                 res = -EINVAL;
         }
diff --git a/net/tipc/subscr.c b/net/tipc/subscr.c
index 0747d8a9232f..ac91f0dfa144 100644
--- a/net/tipc/subscr.c
+++ b/net/tipc/subscr.c
@@ -364,9 +364,9 @@ static struct subscription *subscr_subscribe(struct tipc_subscr *s,
         sub->seq.upper = htohl(s->seq.upper, swap);
         sub->timeout = htohl(s->timeout, swap);
         sub->filter = htohl(s->filter, swap);
-        if ((!(sub->filter & TIPC_SUB_PORTS)
-             == !(sub->filter & TIPC_SUB_SERVICE))
-            || (sub->seq.lower > sub->seq.upper)) {
+        if ((!(sub->filter & TIPC_SUB_PORTS) ==
+             !(sub->filter & TIPC_SUB_SERVICE)) ||
+            (sub->seq.lower > sub->seq.upper)) {
                 warn("Subscription rejected, illegal request\n");
                 kfree(sub);
                 subscr_terminate(subscriber);