diff options
| author | Florian Westphal | 2018-02-15 00:23:05 +0100 |
|---|---|---|
| committer | Pablo Neira Ayuso | 2018-02-25 20:15:53 +0100 |
| commit | 47b7e7f82802dced3ac73658bf4b77584a63063f (patch) | |
| tree | 2f7da12fa07b876dbfd2c433452f636f70420e05 /net/ipv6/netfilter/nft_fib_ipv6.c | |
| parent | netfilter: increase IPSTATS_MIB_CSUMERRORS stat (diff) | |
| download | kernel-qcow2-linux-47b7e7f82802dced3ac73658bf4b77584a63063f.tar.gz kernel-qcow2-linux-47b7e7f82802dced3ac73658bf4b77584a63063f.tar.xz kernel-qcow2-linux-47b7e7f82802dced3ac73658bf4b77584a63063f.zip | |
netfilter: don't set F_IFACE on ipv6 fib lookups
"fib" starts to behave strangely when an ipv6 default route is
added - the FIB lookup returns a route using 'oif' in this case.
This behaviour was inherited from ip6tables rpfilter so change
this as well.
Bugzilla: https://bugzilla.netfilter.org/show_bug.cgi?id=1221
Signed-off-by: Florian Westphal <fw@strlen.de>
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
Diffstat (limited to 'net/ipv6/netfilter/nft_fib_ipv6.c')
| -rw-r--r-- | net/ipv6/netfilter/nft_fib_ipv6.c | 12 |
1 files changed, 2 insertions, 10 deletions
diff --git a/net/ipv6/netfilter/nft_fib_ipv6.c b/net/ipv6/netfilter/nft_fib_ipv6.c index cc5174c7254c..62fc84d7bdff 100644 --- a/net/ipv6/netfilter/nft_fib_ipv6.c +++ b/net/ipv6/netfilter/nft_fib_ipv6.c @@ -180,7 +180,6 @@ void nft_fib6_eval(const struct nft_expr *expr, struct nft_regs *regs, } *dest = 0; - again: rt = (void *)ip6_route_lookup(nft_net(pkt), &fl6, lookup_flags); if (rt->dst.error) goto put_rt_err; @@ -189,15 +188,8 @@ void nft_fib6_eval(const struct nft_expr *expr, struct nft_regs *regs, if (rt->rt6i_flags & (RTF_REJECT | RTF_ANYCAST | RTF_LOCAL)) goto put_rt_err; - if (oif && oif != rt->rt6i_idev->dev) { - /* multipath route? Try again with F_IFACE */ - if ((lookup_flags & RT6_LOOKUP_F_IFACE) == 0) { - lookup_flags |= RT6_LOOKUP_F_IFACE; - fl6.flowi6_oif = oif->ifindex; - ip6_rt_put(rt); - goto again; - } - } + if (oif && oif != rt->rt6i_idev->dev) + goto put_rt_err; switch (priv->result) { case NFT_FIB_RESULT_OIF: |