Commit 8c6216d7 authored Mar 13, 2013 by Timo Teräs Committed by David S. Miller Mar 16, 2013

Revert "ip_gre: make ipgre_tunnel_xmit() not parse network header as IP unconditionally"



This reverts commit 412ed947.

The commit is wrong as tiph points to the outer IPv4 header which is
installed at ipgre_header() and not the inner one which is protocol dependant.

This commit broke succesfully opennhrp which use PF_PACKET socket with
ETH_P_NHRP protocol. Additionally ssl_addr is set to the link-layer
IPv4 address. This address is written by ipgre_header() to the skb
earlier, and this is the IPv4 header tiph should point to - regardless
of the inner protocol payload.

Signed-off-by: Timo Teräs <timo.teras@iki.fi>
Signed-off-by: David S. Miller <davem@davemloft.net>

parent aaa0c23c

net/ipv4/ip_gre.c

+1 −4

Original line number	Diff line number	Diff line
		@@ -798,10 +798,7 @@ static netdev_tx_t ipgre_tunnel_xmit(struct sk_buff skb, struct net_device dev

		if (dev->header_ops && dev->type == ARPHRD_IPGRE) {
		gre_hlen = 0;
		if (skb->protocol == htons(ETH_P_IP))
		tiph = (const struct iphdr *)skb->data;
		else
		tiph = &tunnel->parms.iph;
		} else {
		gre_hlen = tunnel->hlen;
		tiph = &tunnel->parms.iph;

Admin message