diff options
| author | Pablo Neira Ayuso <pablo@netfilter.org> | 2015-09-10 01:30:06 +0200 |
|---|---|---|
| committer | Pablo Neira Ayuso <pablo@netfilter.org> | 2015-09-11 14:32:04 +0200 |
| commit | 4bfcee9847fa4d45685638cb505782bcd6ee2853 (patch) | |
| tree | 1812cedce6a841a15f30705a5efeb3ded1db9eee /src | |
| parent | 0663bfe7ece4fcb57bd78c7eab2001345527b74c (diff) | |
evaluate: use existing table object from evaluation context
Skip table object lookup if we are in the context of table declaration already,
ctx->table already points to the right table we have to use during the
evalution. Otherwise, a list corruption occurs when using the wrong table
object when it already exists in the kernel.
http://marc.info/?l=netfilter-devel&m=144179814209295&w=2
Reported-by: Arturo Borrero Gonzalez <arturo.borrero.glez@gmail.com>
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
Tested-by: Arturo Borrero Gonzalez <arturo.borrero.glez@gmail.com>
Diffstat (limited to 'src')
| -rw-r--r-- | src/evaluate.c | 22 |
1 files changed, 18 insertions, 4 deletions
diff --git a/src/evaluate.c b/src/evaluate.c index 1405da83..22dd6d56 100644 --- a/src/evaluate.c +++ b/src/evaluate.c @@ -1711,12 +1711,26 @@ int stmt_evaluate(struct eval_ctx *ctx, struct stmt *stmt) } } +static struct table *table_lookup_global(struct eval_ctx *ctx) +{ + struct table *table; + + if (ctx->table != NULL) + return ctx->cmd->table; + + table = table_lookup(&ctx->cmd->handle); + if (table == NULL) + return NULL; + + return table; +} + static int setelem_evaluate(struct eval_ctx *ctx, struct expr **expr) { struct table *table; struct set *set; - table = table_lookup(&ctx->cmd->handle); + table = table_lookup_global(ctx); if (table == NULL) return cmd_error(ctx, "Could not process rule: Table '%s' does not exist", ctx->cmd->handle.table); @@ -1739,7 +1753,7 @@ static int set_evaluate(struct eval_ctx *ctx, struct set *set) struct table *table; const char *type; - table = table_lookup(&ctx->cmd->handle); + table = table_lookup_global(ctx); if (table == NULL) return cmd_error(ctx, "Could not process rule: Table '%s' does not exist", ctx->cmd->handle.table); @@ -1857,9 +1871,9 @@ static int chain_evaluate(struct eval_ctx *ctx, struct chain *chain) struct table *table; struct rule *rule; - table = table_lookup(&ctx->cmd->handle); + table = table_lookup_global(ctx); if (table == NULL) - return cmd_error(ctx, "Table '%s' does not exist", + return cmd_error(ctx, "Could not process rule: Table '%s' does not exist", ctx->cmd->handle.table); if (chain == NULL) { |