Commit 1f21dc67 authored by Aaron Conole's avatar Aaron Conole Committed by Greg Kroah-Hartman

af_unix: return data from multiple SKBs on recv() with MSG_PEEK flag

[ Upstream commit 9f389e35674f5b086edd70ed524ca0f287259725 ]

AF_UNIX sockets now return multiple skbs from recv() when MSG_PEEK flag
is set.

This is referenced in kernel bugzilla #12323 @

As described both in the BZ and lkml thread @ calling recv() with MSG_PEEK on an
AF_UNIX socket only reads a single skb, where the desired effect is
to return as much skb data has been queued, until hitting the recv
buffer size (whichever comes first).

The modified MSG_PEEK path will now move to the next skb in the tree
and jump to the again: label, rather than following the natural loop
structure. This requires duplicating some of the loop head actions.

This was tested using the python socketpair python code attached to
the bugzilla issue.
Signed-off-by: default avatarAaron Conole <>
Signed-off-by: default avatarDavid S. Miller <>
Signed-off-by: default avatarGreg Kroah-Hartman <>
parent f9b8d11b
......@@ -2063,8 +2063,20 @@ again:
if (UNIXCB(skb).fp)
siocb->scm->fp = scm_fp_dup(UNIXCB(skb).fp);
sk_peek_offset_fwd(sk, chunk);
if (skip) {
sk_peek_offset_fwd(sk, chunk);
skip -= chunk;
if (UNIXCB(skb).fp)
last = skb;
skb = skb_peek_next(skb, &sk->sk_receive_queue);
if (skb)
goto again;
} while (size);
Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment