diff options
| author | Pablo Neira Ayuso <pablo@netfilter.org> | 2022-10-31 11:35:31 +0100 |
|---|---|---|
| committer | Pablo Neira Ayuso <pablo@netfilter.org> | 2022-10-31 12:51:10 +0100 |
| commit | c8a3c669499d169fef8c1e89b8d2d909e5ecd023 (patch) | |
| tree | 5d33dff7339153210f0364c61f452dfd30ab0f55 /src | |
| parent | bdea233e6b5283ed48fd593a842b677b7833b892 (diff) | |
payload: do not kill dependency for proto_unknown
Unsupported meta match on layer 4 protocol sets on protocol context to
proto_unknown, handle anything coming after it as a raw expression in
payload_expr_expand().
Moreover, payload_dependency_kill() skips dependency removal if protocol
is unknown, so raw payload expression leaves meta layer 4 protocol
remains in place.
Closes: https://bugzilla.netfilter.org/show_bug.cgi?id=1641
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
Diffstat (limited to 'src')
| -rw-r--r-- | src/payload.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/payload.c b/src/payload.c index 2c0d0ac9..101bfbda 100644 --- a/src/payload.c +++ b/src/payload.c @@ -848,7 +848,8 @@ static bool payload_may_dependency_kill(struct payload_dep_ctx *ctx, void payload_dependency_kill(struct payload_dep_ctx *ctx, struct expr *expr, unsigned int family) { - if (payload_dependency_exists(ctx, expr->payload.base) && + if (expr->payload.desc != &proto_unknown && + payload_dependency_exists(ctx, expr->payload.base) && payload_may_dependency_kill(ctx, family, expr)) payload_dependency_release(ctx, expr->payload.base); } @@ -1058,8 +1059,9 @@ void payload_expr_expand(struct list_head *list, struct expr *expr, assert(expr->etype == EXPR_PAYLOAD); desc = ctx->protocol[expr->payload.base].desc; - if (desc == NULL) + if (desc == NULL || desc == &proto_unknown) goto raw; + assert(desc->base == expr->payload.base); desc = get_stacked_desc(ctx, desc, expr, &total); |