Commit afce615a authored Jul 24, 2017 by Stefano Brivio Committed by David S. Miller Jul 25, 2017

ipv6: Don't increase IPSTATS_MIB_FRAGFAILS twice in ip6_fragment()



RFC 2465 defines ipv6IfStatsOutFragFails as:

	"The number of IPv6 datagrams that have been discarded
	 because they needed to be fragmented at this output
	 interface but could not be."

The existing implementation, instead, would increase the counter
twice in case we fail to allocate room for single fragments:
once for the fragment, once for the datagram.

This didn't look intentional though. In one of the two affected
affected failure paths, the double increase was simply a result
of a new 'goto fail' statement, introduced to avoid a skb leak.
The other path appears to be affected since at least 2.6.12-rc2.

Reported-by: Sabrina Dubroca <sdubroca@redhat.com>
Fixes: 1d325d21 ("ipv6: ip6_fragment: fix headroom tests and skb leak")
Signed-off-by: Stefano Brivio <sbrivio@redhat.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

parent 78369255

net/ipv6/ip6_output.c

+0 −4

Original line number	Diff line number	Diff line
		@@ -673,8 +673,6 @@ int ip6_fragment(struct net net, struct sock sk, struct sk_buff *skb,
		*prevhdr = NEXTHDR_FRAGMENT;
		tmp_hdr = kmemdup(skb_network_header(skb), hlen, GFP_ATOMIC);
		if (!tmp_hdr) {
		IP6_INC_STATS(net, ip6_dst_idev(skb_dst(skb)),
		IPSTATS_MIB_FRAGFAILS);
		err = -ENOMEM;
		goto fail;
		}
		@@ -789,8 +787,6 @@ slow_path:
		frag = alloc_skb(len + hlen + sizeof(struct frag_hdr) +
		hroom + troom, GFP_ATOMIC);
		if (!frag) {
		IP6_INC_STATS(net, ip6_dst_idev(skb_dst(skb)),
		IPSTATS_MIB_FRAGFAILS);
		err = -ENOMEM;
		goto fail;
		}

Admin message