]> git.proxmox.com Git - mirror_ubuntu-zesty-kernel.git/commit
udp: consistently apply ufo or fragmentation
authorWillem de Bruijn <willemb@google.com>
Thu, 10 Aug 2017 16:29:19 +0000 (12:29 -0400)
committerStefan Bader <stefan.bader@canonical.com>
Fri, 11 Aug 2017 09:37:53 +0000 (11:37 +0200)
commit2f46baae95a2ed192732a07a84c5989bc0a8b72b
treeff18b55da1c145c182da58b201c488fff1c05692
parentad629e8e01adae9bf9a615b9d8dad5aa52b9e17a
udp: consistently apply ufo or fragmentation

When iteratively building a UDP datagram with MSG_MORE and that
datagram exceeds MTU, consistently choose UFO or fragmentation.

Once skb_is_gso, always apply ufo. Conversely, once a datagram is
split across multiple skbs, do not consider ufo.

Sendpage already maintains the first invariant, only add the second.
IPv6 does not have a sendpage implementation to modify.

A gso skb must have a partial checksum, do not follow sk_no_check_tx
in udp_send_skb.

Found by syzkaller.

Fixes: e89e9cf539a2 ("[IPv4/IPv6]: UFO Scatter-gather approach")
Reported-by: Andrey Konovalov <andreyknvl@google.com>
Signed-off-by: Willem de Bruijn <willemb@google.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
CVE-2017-1000112

(cherry-picked from commit 85f1bd9a7b5a79d5baa8bf44af19658f7bf77bfa)
Signed-off-by: Stefan Bader <stefan.bader@canonical.com>
net/ipv4/ip_output.c
net/ipv4/udp.c
net/ipv6/ip6_output.c