netlink_delinerize: don't use meta_match_postprocess for ct pp

meta_match_postprocess uses meta.base which is only accessible if
left expression has EXPR_META type, so we can't use it to handle ct postprocessing.

To reduce copy-pastry factor the common part into ct_meta_common_postprocess(),
then call that from both meta and ct postprocessing.

Signed-off-by: Florian Westphal <fw@strlen.de>
Acked-by: Pablo Neira Ayuso <pablo@netfilter.org>

diff --git a/src/netlink_delinearize.c b/src/netlink_delinearize.c
index de5d66c0db8e2bb3fedad82480a2a80ab2e3d62c..9e260784fb8ab42d9985db5dad70be7811891a07 100644 (file)
--- a/src/netlink_delinearize.c
+++ b/src/netlink_delinearize.c
@@ -1161,6 +1161,23 @@ static void payload_match_postprocess(struct rule_pp_ctx *ctx,
        }
 }
 
+static void ct_meta_common_postprocess(const struct expr *expr)
+{
+       const struct expr *left = expr->left;
+       struct expr *right = expr->right;
+
+       switch (expr->op) {
+       case OP_LOOKUP:
+               expr_set_type(right, left->dtype, left->byteorder);
+               if (right->dtype == &integer_type)
+                       integer_type_postprocess(right);
+               break;
+
+       default:
+               break;
+       }
+}
+
 static void meta_match_postprocess(struct rule_pp_ctx *ctx,
                                   const struct expr *expr)
 {
@@ -1178,13 +1195,8 @@ static void meta_match_postprocess(struct rule_pp_ctx *ctx,
                        payload_dependency_store(&ctx->pdctx, ctx->stmt,
                                                 left->meta.base);
                break;
-       case OP_LOOKUP:
-               expr_set_type(expr->right, expr->left->dtype,
-                             expr->left->byteorder);
-               if (expr->right->dtype == &integer_type)
-                       integer_type_postprocess(expr->right);
-               break;
        default:
+               ct_meta_common_postprocess(expr);
                break;
        }
 }
@@ -1192,7 +1204,17 @@ static void meta_match_postprocess(struct rule_pp_ctx *ctx,
 static void ct_match_postprocess(struct rule_pp_ctx *ctx,
                                 const struct expr *expr)
 {
-       return meta_match_postprocess(ctx, expr);
+       switch (expr->op) {
+       case OP_EQ:
+               if (expr->right->ops->type == EXPR_RANGE)
+                       break;
+
+               expr->left->ops->pctx_update(&ctx->pctx, expr);
+               break;
+       default:
+               ct_meta_common_postprocess(expr);
+               break;
+       }
 }
 
 /* Convert a bitmask to a prefix length */