]> git.ipfire.org Git - thirdparty/nftables.git/commitdiff
evaluate: fix compilation warning
authorPablo Neira Ayuso <pablo@netfilter.org>
Mon, 12 Dec 2022 09:18:10 +0000 (10:18 +0100)
committerPablo Neira Ayuso <pablo@netfilter.org>
Mon, 12 Dec 2022 09:33:44 +0000 (10:33 +0100)
Set pointer to list of expression to NULL and check that it is set on
before using it.

In function ‘expr_evaluate_concat’,
    inlined from ‘expr_evaluate’ at evaluate.c:2488:10:
evaluate.c:1338:20: warning: ‘expressions’ may be used uninitialized [-Wmaybe-uninitialized]
 1338 |                 if (runaway) {
      |                    ^
evaluate.c: In function ‘expr_evaluate’:
evaluate.c:1321:33: note: ‘expressions’ was declared here
 1321 |         const struct list_head *expressions;
      |                                 ^~~~~~~~~~~

Reported-by: Florian Westphal <fw@strlen.de>
Fixes: 508f3a270531 ("netlink: swap byteorder of value component in concatenation of intervals")
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
src/evaluate.c

index 3a524aab0e1200bf7d4f6eb72d9e2f0e208222cd..d0279e335a4e3cdb2aee04ab50594dbbab38e33d 100644 (file)
@@ -1318,7 +1318,7 @@ static int expr_evaluate_concat(struct eval_ctx *ctx, struct expr **expr)
        uint32_t type = dtype ? dtype->type : 0, ntype = 0;
        int off = dtype ? dtype->subtypes : 0;
        unsigned int flags = EXPR_F_CONSTANT | EXPR_F_SINGLETON;
-       const struct list_head *expressions;
+       const struct list_head *expressions = NULL;
        struct expr *i, *next, *key = NULL;
        const struct expr *key_ctx = NULL;
        bool runaway = false;
@@ -1395,7 +1395,7 @@ static int expr_evaluate_concat(struct eval_ctx *ctx, struct expr **expr)
                dsize_bytes = div_round_up(dsize, BITS_PER_BYTE);
                (*expr)->field_len[(*expr)->field_count++] = dsize_bytes;
                size += netlink_padded_len(dsize);
-               if (key) {
+               if (key && expressions) {
                        if (list_is_last(&key->list, expressions))
                                runaway = true;