1 files changed, 12 insertions, 13 deletions

diff --git a/net/unix/af_unix.c b/net/unix/af_unix.c
index 9efe01113c5c..826e09938bff 100644
--- a/net/unix/af_unix.c
+++ b/net/unix/af_unix.c
@@ -1858,10 +1858,10 @@ out:
 }
 
 /*
- *      Sleep until data has arrive. But check for races..
+ *      Sleep until more data has arrived. But check for races..
  */
-
-static long unix_stream_data_wait(struct sock *sk, long timeo)
+static long unix_stream_data_wait(struct sock *sk, long timeo,
+                                  struct sk_buff *last)
 {
         DEFINE_WAIT(wait);
 
@@ -1870,7 +1870,7 @@ static long unix_stream_data_wait(struct sock *sk, long timeo)
         for (;;) {
                 prepare_to_wait(sk_sleep(sk), &wait, TASK_INTERRUPTIBLE);
 
-                if (!skb_queue_empty(&sk->sk_receive_queue) ||
+                if (skb_peek_tail(&sk->sk_receive_queue) != last ||
                     sk->sk_err ||
                     (sk->sk_shutdown & RCV_SHUTDOWN) ||
                     signal_pending(current) ||
@@ -1889,8 +1889,6 @@ static long unix_stream_data_wait(struct sock *sk, long timeo)
         return timeo;
 }
 
-
-
 static int unix_stream_recvmsg(struct kiocb *iocb, struct socket *sock,
                                struct msghdr *msg, size_t size,
                                int flags)
@@ -1935,14 +1933,12 @@ static int unix_stream_recvmsg(struct kiocb *iocb, struct socket *sock,
                 goto out;
         }
 
-        skip = sk_peek_offset(sk, flags);
-
         do {
                 int chunk;
-                struct sk_buff *skb;
+                struct sk_buff *skb, *last;
 
                 unix_state_lock(sk);
-                skb = skb_peek(&sk->sk_receive_queue);
+                last = skb = skb_peek(&sk->sk_receive_queue);
 again:
                 if (skb == NULL) {
                         unix_sk(sk)->recursion_level = 0;
@@ -1965,7 +1961,7 @@ again:
                                 break;
                         mutex_unlock(&u->readlock);
 
-                        timeo = unix_stream_data_wait(sk, timeo);
+                        timeo = unix_stream_data_wait(sk, timeo, last);
 
                         if (signal_pending(current)
                             ||  mutex_lock_interruptible(&u->readlock)) {
@@ -1979,10 +1975,13 @@ again:
                         break;
                 }
 
-                if (skip >= skb->len) {
+                skip = sk_peek_offset(sk, flags);
+                while (skip >= skb->len) {
                         skip -= skb->len;
+                        last = skb;
                         skb = skb_peek_next(skb, &sk->sk_receive_queue);
-                        goto again;
+                        if (!skb)
+                                goto again;
                 }
 
                 unix_state_unlock(sk);