diff options
| author | Andrey Vagin <avagin@openvz.org> | 2015-10-02 00:05:36 +0300 |
|---|---|---|
| committer | Luis Henriques <luis.henriques@canonical.com> | 2015-10-28 10:33:17 +0000 |
| commit | f465fb249f3a7ff729193a66c3947caa154e83d9 (patch) | |
| tree | c27643ed9db82ac313d2aeb65a704373d67498fb /include/linux/skbuff.h | |
| parent | f50e5d9fd2586e205d7fe003b1b594468a709a1c (diff) | |
net/unix: fix logic about sk_peek_offset
commit e9193d60d363e4dff75ff6d43a48f22be26d59c7 upstream.
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>
Signed-off-by: Luis Henriques <luis.henriques@canonical.com>
Diffstat (limited to 'include/linux/skbuff.h')
0 files changed, 0 insertions, 0 deletions