]> git.ipfire.org Git - thirdparty/nftables.git/commitdiff
evaluate: validate maximum log statement prefix length
authorPablo Neira Ayuso <pablo@netfilter.org>
Tue, 17 Oct 2023 13:50:21 +0000 (15:50 +0200)
committerPablo Neira Ayuso <pablo@netfilter.org>
Tue, 17 Oct 2023 13:54:23 +0000 (15:54 +0200)
Otherwise too long string overruns the log prefix buffer.

Fixes: e76bb3794018 ("src: allow for variables in the log prefix string")
Closes: https://bugzilla.netfilter.org/show_bug.cgi?id=1714
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
src/evaluate.c

index b7ae9113b5a846e44545d37770a8663c30274243..2196e92813d04b885d4c48808d508d8bd924e5c1 100644 (file)
@@ -4175,8 +4175,13 @@ static int stmt_evaluate_log_prefix(struct eval_ctx *ctx, struct stmt *stmt)
        size_t offset = 0;
        struct expr *expr;
 
-       if (stmt->log.prefix->etype != EXPR_LIST)
+       if (stmt->log.prefix->etype != EXPR_LIST) {
+               if (stmt->log.prefix &&
+                   div_round_up(stmt->log.prefix->len, BITS_PER_BYTE) >= NF_LOG_PREFIXLEN)
+                       return expr_error(ctx->msgs, stmt->log.prefix, "log prefix is too long");
+
                return 0;
+       }
 
        prefix[0] = '\0';