Merge branch 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...

[deliverable/linux.git] / net / netfilter / nft_lookup.c

diff --git a/net/netfilter/nft_lookup.c b/net/netfilter/nft_lookup.c
index 9615b8b9fb37dcf769207537f0545dd2a08c62d6..b3c31ef8015d2517f594dc60a027c52aac8d41fe 100644 (file)
--- a/net/netfilter/nft_lookup.c
+++ b/net/netfilter/nft_lookup.c
@@ -26,15 +26,20 @@ struct nft_lookup {
 };
 
 static void nft_lookup_eval(const struct nft_expr *expr,
-                           struct nft_data data[NFT_REG_MAX + 1],
+                           struct nft_regs *regs,
                            const struct nft_pktinfo *pkt)
 {
        const struct nft_lookup *priv = nft_expr_priv(expr);
        const struct nft_set *set = priv->set;
+       const struct nft_set_ext *ext;
 
-       if (set->ops->lookup(set, &data[priv->sreg], &data[priv->dreg]))
+       if (set->ops->lookup(set, &regs->data[priv->sreg], &ext)) {
+               if (set->flags & NFT_SET_MAP)
+                       nft_data_copy(&regs->data[priv->dreg],
+                                     nft_set_ext_data(ext), set->dlen);
                return;
-       data[NFT_REG_VERDICT].verdict = NFT_BREAK;
+       }
+       regs->verdict.code = NFT_BREAK;
 }
 
 static const struct nla_policy nft_lookup_policy[NFTA_LOOKUP_MAX + 1] = {
@@ -66,8 +71,11 @@ static int nft_lookup_init(const struct nft_ctx *ctx,
                        return PTR_ERR(set);
        }
 
-       priv->sreg = ntohl(nla_get_be32(tb[NFTA_LOOKUP_SREG]));
-       err = nft_validate_input_register(priv->sreg);
+       if (set->flags & NFT_SET_EVAL)
+               return -EOPNOTSUPP;
+
+       priv->sreg = nft_parse_register(tb[NFTA_LOOKUP_SREG]);
+       err = nft_validate_register_load(priv->sreg, set->klen);
        if (err < 0)
                return err;
 
@@ -75,19 +83,16 @@ static int nft_lookup_init(const struct nft_ctx *ctx,
                if (!(set->flags & NFT_SET_MAP))
                        return -EINVAL;
 
-               priv->dreg = ntohl(nla_get_be32(tb[NFTA_LOOKUP_DREG]));
-               err = nft_validate_output_register(priv->dreg);
+               priv->dreg = nft_parse_register(tb[NFTA_LOOKUP_DREG]);
+               err = nft_validate_register_store(ctx, priv->dreg, NULL,
+                                                 set->dtype, set->dlen);
                if (err < 0)
                        return err;
-
-               if (priv->dreg == NFT_REG_VERDICT) {
-                       if (set->dtype != NFT_DATA_VERDICT)
-                               return -EINVAL;
-               } else if (set->dtype == NFT_DATA_VERDICT)
-                       return -EINVAL;
        } else if (set->flags & NFT_SET_MAP)
                return -EINVAL;
 
+       priv->binding.flags = set->flags & NFT_SET_MAP;
+
        err = nf_tables_bind_set(ctx, set, &priv->binding);
        if (err < 0)
                return err;
@@ -110,10 +115,10 @@ static int nft_lookup_dump(struct sk_buff *skb, const struct nft_expr *expr)
 
        if (nla_put_string(skb, NFTA_LOOKUP_SET, priv->set->name))
                goto nla_put_failure;
-       if (nla_put_be32(skb, NFTA_LOOKUP_SREG, htonl(priv->sreg)))
+       if (nft_dump_register(skb, NFTA_LOOKUP_SREG, priv->sreg))
                goto nla_put_failure;
        if (priv->set->flags & NFT_SET_MAP)
-               if (nla_put_be32(skb, NFTA_LOOKUP_DREG, htonl(priv->dreg)))
+               if (nft_dump_register(skb, NFTA_LOOKUP_DREG, priv->dreg))
                        goto nla_put_failure;
        return 0;