Commit 00b20340 authored May 03, 2016 by Jiri Benc Committed by David S. Miller May 04, 2016

gre: remove superfluous pskb_may_pull

The call to gre_parse_header is either followed by iptunnel_pull_header, or
in the case of ICMP error path, the actual header is not accessed at all.

In the first case, iptunnel_pull_header will call pskb_may_pull anyway and
it's pointless to do it twice. The only difference is what call will fail
with what error code but the net effect is still the same in all call sites.

In the second case, pskb_may_pull is pointless, as skb->data is at the outer
IP header and not at the GRE header.

Signed-off-by: Jiri Benc <jbenc@redhat.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

parent 3f7496aa

net/ipv4/gre_demux.c

+1 −4

Original line number	Diff line number	Diff line
		@@ -114,11 +114,8 @@ int gre_parse_header(struct sk_buff skb, struct tnl_ptk_info tpi,
		*/
		if (greh->flags == 0 && tpi->proto == htons(ETH_P_WCCP)) {
		tpi->proto = htons(ETH_P_IP);
		if (((u8 )options & 0xF0) != 0x40) {
		if (((u8 )options & 0xF0) != 0x40)
		hdr_len += 4;
		if (!pskb_may_pull(skb, hdr_len))
		return -EINVAL;
		}
		}
		return hdr_len;
		}

Admin message