Commit 43a4dea4 authored by Steffen Klassert's avatar Steffen Klassert Committed by David S. Miller
Browse files

xfrm: Assign the inner mode output function to the dst entry 



As it is, we assign the outer modes output function to the dst entry
when we create the xfrm bundle. This leads to two problems on interfamily
scenarios. We might insert ipv4 packets into ip6_fragment when called
from xfrm6_output. The system crashes if we try to fragment an ipv4
packet with ip6_fragment. This issue was introduced with git commit
ad0081e4 (ipv6: Fragment locally generated tunnel-mode IPSec6 packets
as needed). The second issue is, that we might insert ipv4 packets in
netfilter6 and vice versa on interfamily scenarios.

With this patch we assign the inner mode output function to the dst entry
when we create the xfrm bundle. So xfrm4_output/xfrm6_output from the inner
mode is used and the right fragmentation and netfilter functions are called.
We switch then to outer mode with the output_finish functions.

Signed-off-by: default avatarSteffen Klassert <steffen.klassert@secunet.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent e14a5993

include/net/xfrm.h

+3 −0
Original line number Diff line number Diff line
@@ -324,6 +324,7 @@ struct xfrm_state_afinfo { 
	int			(*tmpl_sort)(struct xfrm_tmpl **dst, struct xfrm_tmpl **src, int n);

	int			(*state_sort)(struct xfrm_state **dst, struct xfrm_state **src, int n);

	int			(*output)(struct sk_buff *skb);

	int			(*output_finish)(struct sk_buff *skb);

	int			(*extract_input)(struct xfrm_state *x,

						 struct sk_buff *skb);

	int			(*extract_output)(struct xfrm_state *x,
@@ -1454,6 +1455,7 @@ static inline int xfrm4_rcv_spi(struct sk_buff *skb, int nexthdr, __be32 spi) 
extern int xfrm4_extract_output(struct xfrm_state *x, struct sk_buff *skb);

extern int xfrm4_prepare_output(struct xfrm_state *x, struct sk_buff *skb);

extern int xfrm4_output(struct sk_buff *skb);

extern int xfrm4_output_finish(struct sk_buff *skb);

extern int xfrm4_tunnel_register(struct xfrm_tunnel *handler, unsigned short family);

extern int xfrm4_tunnel_deregister(struct xfrm_tunnel *handler, unsigned short family);

extern int xfrm6_extract_header(struct sk_buff *skb);
@@ -1470,6 +1472,7 @@ extern __be32 xfrm6_tunnel_spi_lookup(struct net *net, xfrm_address_t *saddr); 
extern int xfrm6_extract_output(struct xfrm_state *x, struct sk_buff *skb);

extern int xfrm6_prepare_output(struct xfrm_state *x, struct sk_buff *skb);

extern int xfrm6_output(struct sk_buff *skb);

extern int xfrm6_output_finish(struct sk_buff *skb);

extern int xfrm6_find_1stfragopt(struct xfrm_state *x, struct sk_buff *skb,

				 u8 **prevhdr);

net/ipv4/xfrm4_output.c

+6 −2
Original line number Diff line number Diff line
@@ -69,7 +69,7 @@ int xfrm4_prepare_output(struct xfrm_state *x, struct sk_buff *skb) 
}

EXPORT_SYMBOL(xfrm4_prepare_output);



static int xfrm4_output_finish(struct sk_buff *skb)

int xfrm4_output_finish(struct sk_buff *skb)

{

#ifdef CONFIG_NETFILTER

	if (!skb_dst(skb)->xfrm) {
@@ -86,7 +86,11 @@ static int xfrm4_output_finish(struct sk_buff *skb) 


int xfrm4_output(struct sk_buff *skb)

{

	struct dst_entry *dst = skb_dst(skb);

	struct xfrm_state *x = dst->xfrm;



	return NF_HOOK_COND(NFPROTO_IPV4, NF_INET_POST_ROUTING, skb,

			    NULL, skb_dst(skb)->dev, xfrm4_output_finish,

			    NULL, dst->dev,

			    x->outer_mode->afinfo->output_finish,

			    !(IPCB(skb)->flags & IPSKB_REROUTED));

}

net/ipv4/xfrm4_state.c

+1 −0
Original line number Diff line number Diff line
@@ -78,6 +78,7 @@ static struct xfrm_state_afinfo xfrm4_state_afinfo = { 
	.init_tempsel		= __xfrm4_init_tempsel,

	.init_temprop		= xfrm4_init_temprop,

	.output			= xfrm4_output,

	.output_finish		= xfrm4_output_finish,

	.extract_input		= xfrm4_extract_input,

	.extract_output		= xfrm4_extract_output,

	.transport_finish	= xfrm4_transport_finish,

net/ipv6/xfrm6_output.c

+3 −3
Original line number Diff line number Diff line
@@ -79,7 +79,7 @@ int xfrm6_prepare_output(struct xfrm_state *x, struct sk_buff *skb) 
}

EXPORT_SYMBOL(xfrm6_prepare_output);



static int xfrm6_output_finish(struct sk_buff *skb)

int xfrm6_output_finish(struct sk_buff *skb)

{

#ifdef CONFIG_NETFILTER

	IP6CB(skb)->flags |= IP6SKB_XFRM_TRANSFORMED;
@@ -97,9 +97,9 @@ static int __xfrm6_output(struct sk_buff *skb) 
	if ((x && x->props.mode == XFRM_MODE_TUNNEL) &&

	    ((skb->len > ip6_skb_dst_mtu(skb) && !skb_is_gso(skb)) ||

		dst_allfrag(skb_dst(skb)))) {

			return ip6_fragment(skb, xfrm6_output_finish);

			return ip6_fragment(skb, x->outer_mode->afinfo->output_finish);

	}

	return xfrm6_output_finish(skb);

	return x->outer_mode->afinfo->output_finish(skb);

}



int xfrm6_output(struct sk_buff *skb)

net/ipv6/xfrm6_state.c

+1 −0
Original line number Diff line number Diff line
@@ -178,6 +178,7 @@ static struct xfrm_state_afinfo xfrm6_state_afinfo = { 
	.tmpl_sort		= __xfrm6_tmpl_sort,

	.state_sort		= __xfrm6_state_sort,

	.output			= xfrm6_output,

	.output_finish		= xfrm6_output_finish,

	.extract_input		= xfrm6_extract_input,

	.extract_output		= xfrm6_extract_output,

	.transport_finish	= xfrm6_transport_finish,

CRA Git | Maintained and supported by SUSTech CRA and CCSE