summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJiri Benc <jbenc@redhat.com>2016-05-03 15:10:06 (GMT)
committerDavid S. Miller <davem@davemloft.net>2016-05-04 18:11:31 (GMT)
commit00b2034029840ddad255352c46db0ae21342ce56 (patch)
tree043bf1c60ccdf86257a34c61b629726247a9d1c8
parent3f7496aa72d3411579f996eb3998d1441906e99d (diff)
downloadlinux-00b2034029840ddad255352c46db0ae21342ce56.tar.xz
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>
-rw-r--r--net/ipv4/gre_demux.c5
1 files changed, 1 insertions, 4 deletions
diff --git a/net/ipv4/gre_demux.c b/net/ipv4/gre_demux.c
index a41e73a..d78e2ee 100644
--- a/net/ipv4/gre_demux.c
+++ b/net/ipv4/gre_demux.c
@@ -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;
}