ipv6: defrag: drop non-last frags smaller than min mtu
Subsystems (4)
Florian Westphal
maintainerPATCH v2 1/1 ipv6: defrag: drop non-last frags smaller than min mtu
don't bother with pathological cases, they only waste cycles. IPv6 requires a minimum MTU of 1280 so we should never see fragments smaller than this (except last frag).
v2: drop IPv4 part, which added same check w. IPV4_MIN_MTU (68).
There were concerns that there could be even smaller frags generated by intermediate nodes, e.g. on radio networks.
Cc Peter Oskolkov <[email protected]>
Cc Eric Dumazet <[email protected]>
Signed-off-by Florian Westphal <[email protected]>
--- net/ipv6/netfilter/nf_conntrack_reasm.c | 4 ++++ net/ipv6/reassembly.c | 4 ++++ 2 files changed, 8 insertions(+)
net/ipv6/netfilter/nf_conntrack_reasm.c +4 -0
@@ -557,6 +557,10 @@ int nf_ct_frag6_gather(struct net *net, struct sk_buff *skb, u32 user) hdr =ipv6_hdr (skb); fhdr = (struct frag_hdr *)skb_transport_header (skb); +if (-skb_network_offset (skb) + skb->len <IPV6_MIN_MTU && + fhdr->frag_off &htons (IP6_MF )) +return -EINVAL ; +skb_orphan (skb); fq =fq_find (net, fhdr->identification, user, hdr, skb->dev ? skb->dev->ifindex :0 );
net/ipv6/reassembly.c +4 -0
@@ -455,6 +455,10 @@ static int ipv6_frag_rcv(struct sk_buff *skb)return 1 ; } +if (-skb_network_offset (skb) + skb->len <IPV6_MIN_MTU && + fhdr->frag_off &htons (IP6_MF )) + goto fail_hdr; + iif = skb->dev ? skb->dev->ifindex :0 ; fq =fq_find (net, fhdr->identification, hdr, iif);if (fq) {
Signature · 1 line
2.16.4
Review
Quoted 1 line · On Fri, 3 Aug 2018 02:05:39 +0200 Florian Westphal <[email protected]> wrote:
(quoted diff) +1
-0+ if (-skb_network_offset(skb) + skb->len < IPV6_MIN_MTU &&
Is there a reason to write the arithmetic expression in this order? Why not:
if (skb->len - skb_network_offset(skb) < IPV6_MIN_MTU &&