diff options
| author | Eric Dumazet <edumazet@google.com> | 2016-08-30 00:34:58 -0400 |
|---|---|---|
| committer | Andres Oportus <andresoportus@google.com> | 2017-02-03 16:00:52 -0800 |
| commit | 0213f79a418915f2db36572ae86b748438ed635b (patch) | |
| tree | 21e7ba6c202d7ca9f37d64f2e542593dec1bf403 /include/linux | |
| parent | edc166a8714b012a3dd207e437c772ae2a264eca (diff) | |
UPSTREAM: udp: properly support MSG_PEEK with truncated buffers
[ Upstream commit 197c949e7798fbf28cfadc69d9ca0c2abbf93191 ]
Backport of this upstream commit into stable kernels :
89c22d8c3b27 ("net: Fix skb csum races when peeking")
exposed a bug in udp stack vs MSG_PEEK support, when user provides
a buffer smaller than skb payload.
In this case,
skb_copy_and_csum_datagram_iovec(skb, sizeof(struct udphdr),
msg->msg_iov);
returns -EFAULT.
This bug does not happen in upstream kernels since Al Viro did a great
job to replace this into :
skb_copy_and_csum_datagram_msg(skb, sizeof(struct udphdr), msg);
This variant is safe vs short buffers.
For the time being, instead reverting Herbert Xu patch and add back
skb->ip_summed invalid changes, simply store the result of
udp_lib_checksum_complete() so that we avoid computing the checksum a
second time, and avoid the problematic
skb_copy_and_csum_datagram_iovec() call.
This patch can be applied on recent kernels as it avoids a double
checksumming, then backported to stable kernels as a bug fix.
Signed-off-by: Eric Dumazet <edumazet@google.com>
Acked-by: Herbert Xu <herbert@gondor.apana.org.au>
Signed-off-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Sasha Levin <alexander.levin@verizon.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
(cherry picked from commit dfe2042d96065f044a794f684e9f7976a4ca6e24)
Bug: 32813456
Diffstat (limited to 'include/linux')
0 files changed, 0 insertions, 0 deletions
