1 files changed, 13 insertions, 14 deletions

diff --git a/net/tipc/socket.c b/net/tipc/socket.c
index cee6674a3bf4..3bb45042e833 100644
--- a/net/tipc/socket.c
+++ b/net/tipc/socket.c
@@ -692,10 +692,9 @@ static int tipc_getname(struct socket *sock, struct sockaddr *uaddr,
 }
 
 /**
- * tipc_poll - read and possibly block on pollmask
+ * tipc_poll - read pollmask
  * @file: file structure associated with the socket
  * @sock: socket for which to calculate the poll bits
- * @wait: ???
  *
  * Returns pollmask value
  *
@@ -709,15 +708,12 @@ static int tipc_getname(struct socket *sock, struct sockaddr *uaddr,
  * imply that the operation will succeed, merely that it should be performed
  * and will not block.
  */
-static __poll_t tipc_poll(struct file *file, struct socket *sock,
-                              poll_table *wait)
+static __poll_t tipc_poll_mask(struct socket *sock, __poll_t events)
 {
         struct sock *sk = sock->sk;
         struct tipc_sock *tsk = tipc_sk(sk);
         __poll_t revents = 0;
 
-        sock_poll_wait(file, sk_sleep(sk), wait);
-
         if (sk->sk_shutdown & RCV_SHUTDOWN)
                 revents |= EPOLLRDHUP | EPOLLIN | EPOLLRDNORM;
         if (sk->sk_shutdown == SHUTDOWN_MASK)
@@ -1278,7 +1274,7 @@ static int __tipc_sendmsg(struct socket *sock, struct msghdr *m, size_t dlen)
         struct tipc_msg *hdr = &tsk->phdr;
         struct tipc_name_seq *seq;
         struct sk_buff_head pkts;
-        u32 dnode, dport;
+        u32 dport, dnode = 0;
         u32 type, inst;
         int mtu, rc;
 
@@ -1348,6 +1344,8 @@ static int __tipc_sendmsg(struct socket *sock, struct msghdr *m, size_t dlen)
                 msg_set_destnode(hdr, dnode);
                 msg_set_destport(hdr, dest->addr.id.ref);
                 msg_set_hdr_sz(hdr, BASIC_H_SIZE);
+        } else {
+                return -EINVAL;
         }
 
         /* Block or return if destination link is congested */
@@ -1514,10 +1512,10 @@ static void tipc_sk_set_orig_addr(struct msghdr *m, struct sk_buff *skb)
 
         srcaddr->sock.family = AF_TIPC;
         srcaddr->sock.addrtype = TIPC_ADDR_ID;
+        srcaddr->sock.scope = 0;
         srcaddr->sock.addr.id.ref = msg_origport(hdr);
         srcaddr->sock.addr.id.node = msg_orignode(hdr);
         srcaddr->sock.addr.name.domain = 0;
-        srcaddr->sock.scope = 0;
         m->msg_namelen = sizeof(struct sockaddr_tipc);
 
         if (!msg_in_group(hdr))
@@ -1526,6 +1524,7 @@ static void tipc_sk_set_orig_addr(struct msghdr *m, struct sk_buff *skb)
         /* Group message users may also want to know sending member's id */
         srcaddr->member.family = AF_TIPC;
         srcaddr->member.addrtype = TIPC_ADDR_NAME;
+        srcaddr->member.scope = 0;
         srcaddr->member.addr.name.name.type = msg_nametype(hdr);
         srcaddr->member.addr.name.name.instance = TIPC_SKB_CB(skb)->orig_member;
         srcaddr->member.addr.name.domain = 0;
@@ -3025,7 +3024,7 @@ static const struct proto_ops msg_ops = {
         .socketpair     = tipc_socketpair,
         .accept         = sock_no_accept,
         .getname        = tipc_getname,
-        .poll           = tipc_poll,
+        .poll_mask      = tipc_poll_mask,
         .ioctl          = tipc_ioctl,
         .listen         = sock_no_listen,
         .shutdown       = tipc_shutdown,
@@ -3046,7 +3045,7 @@ static const struct proto_ops packet_ops = {
         .socketpair     = tipc_socketpair,
         .accept         = tipc_accept,
         .getname        = tipc_getname,
-        .poll           = tipc_poll,
+        .poll_mask      = tipc_poll_mask,
         .ioctl          = tipc_ioctl,
         .listen         = tipc_listen,
         .shutdown       = tipc_shutdown,
@@ -3067,7 +3066,7 @@ static const struct proto_ops stream_ops = {
         .socketpair     = tipc_socketpair,
         .accept         = tipc_accept,
         .getname        = tipc_getname,
-        .poll           = tipc_poll,
+        .poll_mask      = tipc_poll_mask,
         .ioctl          = tipc_ioctl,
         .listen         = tipc_listen,
         .shutdown       = tipc_shutdown,
@@ -3257,8 +3256,8 @@ out:
 }
 EXPORT_SYMBOL(tipc_nl_sk_walk);
 
-int tipc_sk_fill_sock_diag(struct sk_buff *skb, struct tipc_sock *tsk,
-                           u32 sk_filter_state,
+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))
 {
         struct sock *sk = &tsk->sk;
@@ -3280,7 +3279,7 @@ int tipc_sk_fill_sock_diag(struct sk_buff *skb, struct tipc_sock *tsk,
             nla_put_u32(skb, TIPC_NLA_SOCK_TIPC_STATE, (u32)sk->sk_state) ||
             nla_put_u32(skb, TIPC_NLA_SOCK_INO, sock_i_ino(sk)) ||
             nla_put_u32(skb, TIPC_NLA_SOCK_UID,
-                        from_kuid_munged(sk_user_ns(NETLINK_CB(skb).sk),
+                        from_kuid_munged(sk_user_ns(NETLINK_CB(cb->skb).sk),
                                          sock_i_uid(sk))) ||
             nla_put_u64_64bit(skb, TIPC_NLA_SOCK_COOKIE,
                               tipc_diag_gen_cookie(sk),