1 files changed, 11 insertions, 5 deletions

diff --git a/net/unix/af_unix.c b/net/unix/af_unix.c
index 94404f19f9de..e96884380732 100644
--- a/net/unix/af_unix.c
+++ b/net/unix/af_unix.c
@@ -1207,7 +1207,7 @@ restart:
         sk->sk_state    = TCP_ESTABLISHED;
         sock_hold(newsk);
 
-        smp_mb__after_atomic_inc();     /* sock_hold() does an atomic_inc() */
+        smp_mb__after_atomic(); /* sock_hold() does an atomic_inc() */
         unix_peer(sk)   = newsk;
 
         unix_state_unlock(sk);
@@ -1217,7 +1217,7 @@ restart:
         __skb_queue_tail(&other->sk_receive_queue, skb);
         spin_unlock(&other->sk_receive_queue.lock);
         unix_state_unlock(other);
-        other->sk_data_ready(other, 0);
+        other->sk_data_ready(other);
         sock_put(other);
         return 0;
 
@@ -1492,10 +1492,14 @@ static int unix_dgram_sendmsg(struct kiocb *kiocb, struct socket *sock,
         if (len > sk->sk_sndbuf - 32)
                 goto out;
 
-        if (len > SKB_MAX_ALLOC)
+        if (len > SKB_MAX_ALLOC) {
                 data_len = min_t(size_t,
                                  len - SKB_MAX_ALLOC,
                                  MAX_SKB_FRAGS * PAGE_SIZE);
+                data_len = PAGE_ALIGN(data_len);
+
+                BUILD_BUG_ON(SKB_MAX_ALLOC < PAGE_SIZE);
+        }
 
         skb = sock_alloc_send_pskb(sk, len - data_len, data_len,
                                    msg->msg_flags & MSG_DONTWAIT, &err,
@@ -1600,7 +1604,7 @@ restart:
         if (max_level > unix_sk(other)->recursion_level)
                 unix_sk(other)->recursion_level = max_level;
         unix_state_unlock(other);
-        other->sk_data_ready(other, len);
+        other->sk_data_ready(other);
         sock_put(other);
         scm_destroy(siocb->scm);
         return len;
@@ -1670,6 +1674,8 @@ static int unix_stream_sendmsg(struct kiocb *kiocb, struct socket *sock,
 
                 data_len = max_t(int, 0, size - SKB_MAX_HEAD(0));
 
+                data_len = min_t(size_t, size, PAGE_ALIGN(data_len));
+
                 skb = sock_alloc_send_pskb(sk, size - data_len, data_len,
                                            msg->msg_flags & MSG_DONTWAIT, &err,
                                            get_order(UNIX_SKB_FRAGS_SZ));
@@ -1706,7 +1712,7 @@ static int unix_stream_sendmsg(struct kiocb *kiocb, struct socket *sock,
                 if (max_level > unix_sk(other)->recursion_level)
                         unix_sk(other)->recursion_level = max_level;
                 unix_state_unlock(other);
-                other->sk_data_ready(other, size);
+                other->sk_data_ready(other);
                 sent += size;
         }