ipv4: Should use consistent conditional judgement for ip fragment in __ip_append_data...
authorzheng li <james.z.li@ericsson.com>
Mon, 12 Dec 2016 01:56:05 +0000 (09:56 +0800)
committerBen Hutchings <ben@decadent.org.uk>
Fri, 15 Sep 2017 17:30:15 +0000 (18:30 +0100)
commitc52f61de88947adfb9d35b7de3dabfee8ef6e7b1
tree5b41b57b0d6d3c6ec5eed107470450c59a3e87d5
parentcb2f131f8dfddcf0979f39b06d3042025ef2bfad
ipv4: Should use consistent conditional judgement for ip fragment in __ip_append_data and ip_finish_output

commit 0a28cfd51e17f4f0a056bcf66bfbe492c3b99f38 upstream.

There is an inconsistent conditional judgement in __ip_append_data and
ip_finish_output functions, the variable length in __ip_append_data just
include the length of application's payload and udp header, don't include
the length of ip header, but in ip_finish_output use
(skb->len > ip_skb_dst_mtu(skb)) as judgement, and skb->len include the
length of ip header.

That causes some particular application's udp payload whose length is
between (MTU - IP Header) and MTU were fragmented by ip_fragment even
though the rst->dev support UFO feature.

Add the length of ip header to length in __ip_append_data to keep
consistent conditional judgement as ip_finish_output for ip fragment.

Signed-off-by: Zheng Li <james.z.li@ericsson.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
[bwh: Backported to 3.16: adjust context to apply after "udp: consistently apply
 ufo or fragmentation"]
Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
net/ipv4/ip_output.c