Commit 5efec5c6 authored Jan 23, 2018 by Yossi Kuperman Committed by Steffen Klassert Jan 23, 2018

xfrm: Fix eth_hdr(skb)->h_proto to reflect inner IP version

IPSec tunnel mode supports encapsulation of IPv4 over IPv6 and vice-versa.

The outer IP header is stripped and the inner IP inherits the original
Ethernet header. Tcpdump fails to properly decode the inner packet in
case that h_proto is different than the inner IP version.

Fix h_proto to reflect the inner IP version.

Signed-off-by: Yossi Kuperman <yossiku@mellanox.com>
Signed-off-by: Steffen Klassert <steffen.klassert@secunet.com>

parent aa5dd6fa

net/ipv4/xfrm4_mode_tunnel.c

+1 −0

Original line number	Diff line number	Diff line
		@@ -92,6 +92,7 @@ static int xfrm4_mode_tunnel_input(struct xfrm_state x, struct sk_buff skb)

		skb_reset_network_header(skb);
		skb_mac_header_rebuild(skb);
		eth_hdr(skb)->h_proto = skb->protocol;

		err = 0;

net/ipv6/xfrm6_mode_tunnel.c

+1 −0

Original line number	Diff line number	Diff line
		@@ -92,6 +92,7 @@ static int xfrm6_mode_tunnel_input(struct xfrm_state x, struct sk_buff skb)

		skb_reset_network_header(skb);
		skb_mac_header_rebuild(skb);
		eth_hdr(skb)->h_proto = skb->protocol;

		err = 0;