netfilter: nft_fib: Fix existence check support

NFTA_FIB_F_PRESENT flag was not always honored since eval functions did
not call nft_fib_store_result in all cases.

Given that in all callsites there is a struct net_device pointer
available which holds the interface data to be stored in destination
register, simplify nft_fib_store_result() to just accept that pointer
instead of the nft_pktinfo pointer and interface index. This also
allows to drop the index to interface lookup previously needed to get
the name associated with given index.

Fixes: 055c4b34b94f6 ("netfilter: nft_fib: Support existence check")
Signed-off-by: Phil Sutter <phil@nwl.cc>
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>

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);
 }