evaluate: use existing table object from evaluation context
Pablo Neira Ayuso
maintainerPATCH 1/1 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
--- src/evaluate.c | 22 ++++++++++++++++++---- 1 file changed, 18 insertions(+), 4 deletions(-)
src/evaluate.c +18 -4
@@ -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 ) {
Signature · 1 line
1.7.10.4
Quoted 5 lines · Pablo Neira Ayuso
Skip table object lookup if we are in the context of table declaration already,
ctx->tablealready 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.
Quoted 8 lines
http://marc.info/?l=netfilter-devel&m=144179814209295&w=2
Reported-by Arturo Borrero Gonzalez <[email protected]>Signed-off-by Pablo Neira Ayuso <[email protected]>--- src/evaluate.c | 22 ++++++++++++++++++---- 1 file changed, 18 insertions(+), 4 deletions(-)
I can't reproduce the issue with this patch, thanks.
Signature · 5 lines
Arturo Borrero González -- To unsubscribe from this list: send the line "unsubscribe netfilter-devel" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html
Pablo Neira Ayuso
maintainerQuoted 15 lines · Arturo Borrero Gonzalez
Quoted 5 lines · Pablo Neira Ayuso
Skip table object lookup if we are in the context of table declaration already,
ctx->tablealready 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.Quoted 8 lines
http://marc.info/?l=netfilter-devel&m=144179814209295&w=2
Reported-by Arturo Borrero Gonzalez <[email protected]>Signed-off-by Pablo Neira Ayuso <[email protected]>--- src/evaluate.c | 22 ++++++++++++++++++---- 1 file changed, 18 insertions(+), 4 deletions(-)
Quoted 3 lines
I can't reproduce the issue with this patch, thanks.
Thanks for testing Arturo.