[IPSEC]: Separate inner/outer mode processing on input

With inter-family transforms the inner mode differs from the outer
mode.  Attempting to handle both sides from the same function means
that it needs to handle both IPv4 and IPv6 which creates duplication
and confusion.

This patch separates the two parts on the input path so that each
function deals with one family only.

In particular, the functions xfrm4_extract_inut/xfrm6_extract_inut
moves the pertinent fields from the IPv4/IPv6 IP headers into a
neutral format stored in skb->cb.  This is then used by the inner mode
input functions to modify the inner IP header.  In this way the input
function no longer has to know about the outer address family.

Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
Signed-off-by: David S. Miller <davem@davemloft.net>

1 files changed, 4 insertions, 1 deletions

diff --git a/net/ipv6/xfrm6_state.c b/net/ipv6/xfrm6_state.c
index 98b05f472322..90fef0a4726f 100644
--- a/net/ipv6/xfrm6_state.c
+++ b/net/ipv6/xfrm6_state.c
@@ -177,7 +177,8 @@ int xfrm6_extract_header(struct sk_buff *skb)
         XFRM_MODE_SKB_CB(skb)->frag_off = htons(IP_DF);
         XFRM_MODE_SKB_CB(skb)->tos = ipv6_get_dsfield(iph);
         XFRM_MODE_SKB_CB(skb)->ttl = iph->hop_limit;
-        XFRM_MODE_SKB_CB(skb)->protocol = iph->nexthdr;
+        XFRM_MODE_SKB_CB(skb)->protocol =
+                skb_network_header(skb)[IP6CB(skb)->nhoff];
         memcpy(XFRM_MODE_SKB_CB(skb)->flow_lbl, iph->flow_lbl,
                sizeof(XFRM_MODE_SKB_CB(skb)->flow_lbl));
 
@@ -187,11 +188,13 @@ int xfrm6_extract_header(struct sk_buff *skb)
 static struct xfrm_state_afinfo xfrm6_state_afinfo = {
         .family                 = AF_INET6,
         .proto                  = IPPROTO_IPV6,
+        .eth_proto              = htons(ETH_P_IPV6),
         .owner                  = THIS_MODULE,
         .init_tempsel           = __xfrm6_init_tempsel,
         .tmpl_sort              = __xfrm6_tmpl_sort,
         .state_sort             = __xfrm6_state_sort,
         .output                 = xfrm6_output,
+        .extract_input          = xfrm6_extract_input,
         .extract_output         = xfrm6_extract_output,
 };