netfilter: flowtable: use dst in this direction when pushing IPIP header

When pushing the IPIP header, the route of the other direction is used
to calculate the headroom, use the route in this direction. Accessing
the other tuple to set the IP source and destination is fine because
this tuple does not provide such information to avoid storing redundant
information. However, this tuple already provides the dst for this
direction, this went unnoticed because this bug affects headroom and
iph->frag_off only at this stage.

Fixes: d30301ba4b07 ("netfilter: flowtable: Add IPIP tx sw acceleration")
Fixes: 93cf357fa797 ("netfilter: flowtable: Add IP6IP6 tx sw acceleration")
Cc: stable@vger.kernel.org
Acked-by: Lorenzo Bianconi <lorenzo@kernel.org>
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
Signed-off-by: Florian Westphal <fw@strlen.de>

diff --git a/net/netfilter/nf_flow_table_ip.c b/net/netfilter/nf_flow_table_ip.c
index 29e93ac1e2e4000bab8c532a7fbe7c9e441bb32c..089f2bc19972f39720faa55ffdea3bf574d82b42 100644 (file)
--- a/net/netfilter/nf_flow_table_ip.c
+++ b/net/netfilter/nf_flow_table_ip.c
@@ -590,10 +590,10 @@ static int nf_flow_pppoe_push(struct sk_buff *skb, u16 id,
 
 static int nf_flow_tunnel_ipip_push(struct net *net, struct sk_buff *skb,
                                    struct flow_offload_tuple *tuple,
-                                   __be32 *ip_daddr)
+                                   struct dst_entry *dst, __be32 *ip_daddr)
 {
        struct iphdr *iph = (struct iphdr *)skb_network_header(skb);
-       struct rtable *rt = dst_rtable(tuple->dst_cache);
+       struct rtable *rt = dst_rtable(dst);
        u8 tos = iph->tos, ttl = iph->ttl;
        __be16 frag_off = iph->frag_off;
        u32 headroom = sizeof(*iph);
@@ -636,21 +636,22 @@ static int nf_flow_tunnel_ipip_push(struct net *net, struct sk_buff *skb,
 
 static int nf_flow_tunnel_v4_push(struct net *net, struct sk_buff *skb,
                                  struct flow_offload_tuple *tuple,
-                                 __be32 *ip_daddr)
+                                 struct dst_entry *dst,  __be32 *ip_daddr)
 {
        if (tuple->tun_num)
-               return nf_flow_tunnel_ipip_push(net, skb, tuple, ip_daddr);
+               return nf_flow_tunnel_ipip_push(net, skb, tuple, dst, ip_daddr);
 
        return 0;
 }
 
 static int nf_flow_tunnel_ip6ip6_push(struct net *net, struct sk_buff *skb,
                                      struct flow_offload_tuple *tuple,
+                                     struct dst_entry *dst,
                                      struct in6_addr **ip6_daddr)
 {
        struct ipv6hdr *ip6h = (struct ipv6hdr *)skb_network_header(skb);
-       struct rtable *rt = dst_rtable(tuple->dst_cache);
        __u8 dsfield = ipv6_get_dsfield(ip6h);
+       struct rtable *rt = dst_rtable(dst);
        struct flowi6 fl6 = {
                .daddr = tuple->tun.src_v6,
                .saddr = tuple->tun.dst_v6,
@@ -696,10 +697,11 @@ static int nf_flow_tunnel_ip6ip6_push(struct net *net, struct sk_buff *skb,
 
 static int nf_flow_tunnel_v6_push(struct net *net, struct sk_buff *skb,
                                  struct flow_offload_tuple *tuple,
+                                 struct dst_entry *dst,
                                  struct in6_addr **ip6_daddr)
 {
        if (tuple->tun_num)
-               return nf_flow_tunnel_ip6ip6_push(net, skb, tuple, ip6_daddr);
+               return nf_flow_tunnel_ip6ip6_push(net, skb, tuple, dst, ip6_daddr);
 
        return 0;
 }
@@ -842,7 +844,8 @@ nf_flow_offload_ip_hook(void *priv, struct sk_buff *skb,
        other_tuple = &flow->tuplehash[!dir].tuple;
        ip_daddr = other_tuple->src_v4.s_addr;
 
-       if (nf_flow_tunnel_v4_push(state->net, skb, other_tuple, &ip_daddr) < 0)
+       if (nf_flow_tunnel_v4_push(state->net, skb, other_tuple,
+                                  tuplehash->tuple.dst_cache, &ip_daddr) < 0)
                return NF_DROP;
 
        switch (tuplehash->tuple.xmit_type) {
@@ -1158,6 +1161,7 @@ nf_flow_offload_ipv6_hook(void *priv, struct sk_buff *skb,
        ip6_daddr = &other_tuple->src_v6;
 
        if (nf_flow_tunnel_v6_push(state->net, skb, other_tuple,
+                                  tuplehash->tuple.dst_cache,
                                   &ip6_daddr) < 0)
                return NF_DROP;