1 files changed, 16 insertions, 1 deletions

diff --git a/net/unix/af_unix.c b/net/unix/af_unix.c
index 03ee4d359f6a..94f658235fb4 100644
--- a/net/unix/af_unix.c
+++ b/net/unix/af_unix.c
@@ -2064,6 +2064,11 @@ static int unix_stream_read_generic(struct unix_stream_read_state *state)
                 goto out;
         }
 
+        if (flags & MSG_PEEK)
+                skip = sk_peek_offset(sk, flags);
+        else
+                skip = 0;
+
         do {
                 int chunk;
                 struct sk_buff *skb, *last;
@@ -2112,7 +2117,6 @@ unlock:
                         break;
                 }
 
-                skip = sk_peek_offset(sk, flags);
                 while (skip >= unix_skb_len(skb)) {
                         skip -= unix_skb_len(skb);
                         last = skb;
@@ -2181,6 +2185,17 @@ unlock:
 
                         sk_peek_offset_fwd(sk, chunk);
 
+                        if (UNIXCB(skb).fp)
+                                break;
+
+                        skip = 0;
+                        last = skb;
+                        last_len = skb->len;
+                        unix_state_lock(sk);
+                        skb = skb_peek_next(skb, &sk->sk_receive_queue);
+                        if (skb)
+                                goto again;
+                        unix_state_unlock(sk);
                         break;
                 }
         } while (size);