Merge git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nf

Pablo Neira Ayuso says:

====================
Netfilter/IPVS fixes for net

The following patchset contains Netfilter/IPVS fixes for your net tree:

1) Fix crash when dumping rules after conversion to RCU,
   from Florian Westphal.

2) Fix incorrect hook reinjection from nf_queue in case NF_REPEAT,
   from Jagdish Motwani.

3) Fix check for route existence in fib extension, from Phil Sutter.

4) Fix use after free in ip_vs_in() hook, from YueHaibing.

5) Check for veth existence from netfilter selftests,
   from Jeffrin Jose T.

6) Checksum corruption in UDP NAT helpers due to typo,
   from Florian Westphal.

7) Pass up packets to classic forwarding path regardless of
   IPv4 DF bit, patch for the flowtable infrastructure from Florian.

8) Set liberal TCP tracking for flows that are placed in the
   flowtable, in case they need to go back to classic forwarding path,
   also from Florian.

9) Don't add flow with sequence adjustment to flowtable, from Florian.

10) Skip IPv4 options from IPv6 datapath in flowtable, from Florian.

11) Add selftest for the flowtable infrastructure, from Florian.
====================

Signed-off-by: David S. Miller <davem@davemloft.net>

1 files changed, 2 insertions, 14 deletions

diff --git a/net/ipv6/netfilter/nft_fib_ipv6.c b/net/ipv6/netfilter/nft_fib_ipv6.c
index 73cdc0bc63f7..ec068b0cffca 100644
--- a/net/ipv6/netfilter/nft_fib_ipv6.c
+++ b/net/ipv6/netfilter/nft_fib_ipv6.c
@@ -169,8 +169,7 @@ void nft_fib6_eval(const struct nft_expr *expr, struct nft_regs *regs,
 
         if (nft_hook(pkt) == NF_INET_PRE_ROUTING &&
             nft_fib_is_loopback(pkt->skb, nft_in(pkt))) {
-                nft_fib_store_result(dest, priv, pkt,
-                                     nft_in(pkt)->ifindex);
+                nft_fib_store_result(dest, priv, nft_in(pkt));
                 return;
         }
 
@@ -187,18 +186,7 @@ void nft_fib6_eval(const struct nft_expr *expr, struct nft_regs *regs,
         if (oif && oif != rt->rt6i_idev->dev)
                 goto put_rt_err;
 
-        switch (priv->result) {
-        case NFT_FIB_RESULT_OIF:
-                *dest = rt->rt6i_idev->dev->ifindex;
-                break;
-        case NFT_FIB_RESULT_OIFNAME:
-                strncpy((char *)dest, rt->rt6i_idev->dev->name, IFNAMSIZ);
-                break;
-        default:
-                WARN_ON_ONCE(1);
-                break;
-        }
-
+        nft_fib_store_result(dest, priv, rt->rt6i_idev->dev);
  put_rt_err:
         ip6_rt_put(rt);
 }