net/unix: fix logic about sk_peek_offset
authorAndrey Vagin <avagin@openvz.org>
Thu, 1 Oct 2015 21:05:36 +0000 (00:05 +0300)
committerDavid S. Miller <davem@davemloft.net>
Mon, 5 Oct 2015 13:33:09 +0000 (06:33 -0700)
commite9193d60d363e4dff75ff6d43a48f22be26d59c7
treee4b04f96cfc0751df1e06828d603082823003f30
parent215c90afb9ea633026273d81ac9c9ece2b1acd58
net/unix: fix logic about sk_peek_offset

Now send with MSG_PEEK can return data from multiple SKBs.

Unfortunately we take into account the peek offset for each skb,
that is wrong. We need to apply the peek offset only once.

In addition, the peek offset should be used only if MSG_PEEK is set.

Cc: "David S. Miller" <davem@davemloft.net> (maintainer:NETWORKING
Cc: Eric Dumazet <edumazet@google.com> (commit_signer:1/14=7%)
Cc: Aaron Conole <aconole@bytheb.org>
Fixes: 9f389e35674f ("af_unix: return data from multiple SKBs on recv() with MSG_PEEK flag")
Signed-off-by: Andrey Vagin <avagin@openvz.org>
Tested-by: Aaron Conole <aconole@bytheb.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
net/unix/af_unix.c