Merge tag 'nios2-v3.20-rc1' of git://git.rocketboards.org/linux-socfpga-next

[firefly-linux-kernel-4.4.55.git] / net / netfilter / nft_ct.c

diff --git a/net/netfilter/nft_ct.c b/net/netfilter/nft_ct.c
index bd0d41e693416167b4f149f64117e440a5134496..cc5603016242ea8e1f5cdce1d633e3a2687276ae 100644 (file)
--- a/net/netfilter/nft_ct.c
+++ b/net/netfilter/nft_ct.c
@@ -215,22 +215,14 @@ static void nft_ct_l3proto_module_put(uint8_t family)
                nf_ct_l3proto_module_put(family);
 }
 
-static int nft_ct_init_validate_get(const struct nft_expr *expr,
-                                   const struct nlattr * const tb[])
+static int nft_ct_get_init(const struct nft_ctx *ctx,
+                          const struct nft_expr *expr,
+                          const struct nlattr * const tb[])
 {
        struct nft_ct *priv = nft_expr_priv(expr);
+       int err;
 
-       if (tb[NFTA_CT_DIRECTION] != NULL) {
-               priv->dir = nla_get_u8(tb[NFTA_CT_DIRECTION]);
-               switch (priv->dir) {
-               case IP_CT_DIR_ORIGINAL:
-               case IP_CT_DIR_REPLY:
-                       break;
-               default:
-                       return -EINVAL;
-               }
-       }
-
+       priv->key = ntohl(nla_get_be32(tb[NFTA_CT_KEY]));
        switch (priv->key) {
        case NFT_CT_STATE:
        case NFT_CT_DIRECTION:
@@ -262,55 +254,55 @@ static int nft_ct_init_validate_get(const struct nft_expr *expr,
                return -EOPNOTSUPP;
        }
 
-       return 0;
-}
-
-static int nft_ct_init_validate_set(uint32_t key)
-{
-       switch (key) {
-       case NFT_CT_MARK:
-               break;
-       default:
-               return -EOPNOTSUPP;
+       if (tb[NFTA_CT_DIRECTION] != NULL) {
+               priv->dir = nla_get_u8(tb[NFTA_CT_DIRECTION]);
+               switch (priv->dir) {
+               case IP_CT_DIR_ORIGINAL:
+               case IP_CT_DIR_REPLY:
+                       break;
+               default:
+                       return -EINVAL;
+               }
        }
 
+       priv->dreg = ntohl(nla_get_be32(tb[NFTA_CT_DREG]));
+       err = nft_validate_output_register(priv->dreg);
+       if (err < 0)
+               return err;
+
+       err = nft_validate_data_load(ctx, priv->dreg, NULL, NFT_DATA_VALUE);
+       if (err < 0)
+               return err;
+
+       err = nft_ct_l3proto_try_module_get(ctx->afi->family);
+       if (err < 0)
+               return err;
+
        return 0;
 }
 
-static int nft_ct_init(const struct nft_ctx *ctx,
-                      const struct nft_expr *expr,
-                      const struct nlattr * const tb[])
+static int nft_ct_set_init(const struct nft_ctx *ctx,
+                          const struct nft_expr *expr,
+                          const struct nlattr * const tb[])
 {
        struct nft_ct *priv = nft_expr_priv(expr);
        int err;
 
        priv->key = ntohl(nla_get_be32(tb[NFTA_CT_KEY]));
-
-       if (tb[NFTA_CT_DREG]) {
-               err = nft_ct_init_validate_get(expr, tb);
-               if (err < 0)
-                       return err;
-
-               priv->dreg = ntohl(nla_get_be32(tb[NFTA_CT_DREG]));
-               err = nft_validate_output_register(priv->dreg);
-               if (err < 0)
-                       return err;
-
-               err = nft_validate_data_load(ctx, priv->dreg, NULL,
-                                            NFT_DATA_VALUE);
-               if (err < 0)
-                       return err;
-       } else {
-               err = nft_ct_init_validate_set(priv->key);
-               if (err < 0)
-                       return err;
-
-               priv->sreg = ntohl(nla_get_be32(tb[NFTA_CT_SREG]));
-               err = nft_validate_input_register(priv->sreg);
-               if (err < 0)
-                       return err;
+       switch (priv->key) {
+#ifdef CONFIG_NF_CONNTRACK_MARK
+       case NFT_CT_MARK:
+               break;
+#endif
+       default:
+               return -EOPNOTSUPP;
        }
 
+       priv->sreg = ntohl(nla_get_be32(tb[NFTA_CT_SREG]));
+       err = nft_validate_input_register(priv->sreg);
+       if (err < 0)
+               return err;
+
        err = nft_ct_l3proto_try_module_get(ctx->afi->family);
        if (err < 0)
                return err;
@@ -370,7 +362,7 @@ static const struct nft_expr_ops nft_ct_get_ops = {
        .type           = &nft_ct_type,
        .size           = NFT_EXPR_SIZE(sizeof(struct nft_ct)),
        .eval           = nft_ct_get_eval,
-       .init           = nft_ct_init,
+       .init           = nft_ct_get_init,
        .destroy        = nft_ct_destroy,
        .dump           = nft_ct_get_dump,
 };
@@ -379,7 +371,7 @@ static const struct nft_expr_ops nft_ct_set_ops = {
        .type           = &nft_ct_type,
        .size           = NFT_EXPR_SIZE(sizeof(struct nft_ct)),
        .eval           = nft_ct_set_eval,
-       .init           = nft_ct_init,
+       .init           = nft_ct_set_init,
        .destroy        = nft_ct_destroy,
        .dump           = nft_ct_set_dump,
 };