ipv6: protect mtu calculation of wrap-around and infinite loop by rounding issues

strssndktn · davem330 · commit 89bc7848a91b · 2015-10-29T07:01:50.000-07:00
Raw sockets with hdrincl enabled can insert ipv6 extension headers
right into the data stream. In case we need to fragment those packets,
we reparse the options header to find the place where we can insert
the fragment header. If the extension headers exceed the link's MTU we
actually cannot make progress in such a case.

Instead of ending up in broken arithmetic or rounding towards 0 and
entering an endless loop in ip6_fragment, just prevent those cases by
aborting early and signal -EMSGSIZE to user space.

This is the second version of the patch which doesn't use the
overflow_usub function, which got reverted for now.

Suggested-by: Linus Torvalds &lt;torvalds@linux-foundation.org&gt;
Cc: Linus Torvalds &lt;torvalds@linux-foundation.org&gt;
Reported-by: Dmitry Vyukov &lt;dvyukov@google.com&gt;
Cc: Dmitry Vyukov &lt;dvyukov@google.com&gt;
Signed-off-by: Hannes Frederic Sowa &lt;hannes@stressinduktion.org&gt;
Signed-off-by: David S. Miller &lt;davem@davemloft.net&gt;
diff --git a/net/ipv6/ip6_output.c b/net/ipv6/ip6_output.c
@@ -584,6 +584,8 @@ int ip6_fragment(struct sock *sk, struct sk_buff *skb,
 		if (np->frag_size)
 			mtu = np->frag_size;
 	}
+	if (mtu < hlen + sizeof(struct frag_hdr) + 8)
+		goto fail_toobig;
 	mtu -= hlen + sizeof(struct frag_hdr);
 
 	frag_id = ipv6_select_ident(net, &ipv6_hdr(skb)->daddr,

Original file line number	Diff line number	Diff line change
`@@ -584,6 +584,8 @@ int ip6_fragment(struct sock sk, struct sk_buff skb,`
`584`	`584`	`if (np->frag_size)`
`585`	`585`	`mtu = np->frag_size;`
`586`	`586`	`}`
	`587`	`+ if (mtu < hlen + sizeof(struct frag_hdr) + 8)`
	`588`	`+ goto fail_toobig;`
`587`	`589`	`mtu -= hlen + sizeof(struct frag_hdr);`
`588`	`590`
`589`	`591`	`frag_id = ipv6_select_ident(net, &ipv6_hdr(skb)->daddr,`