src: add rule_stmt_insert_at() and use it
Pablo Neira Ayuso
maintainerPATCH 1/2 src: add rule_stmt_insert_at() and use it
This helper function adds a statement at a given position and it updates the rule statement counter.
This patch fixes this:
flush table bridge test-bridge
add rule bridge test-bridge input vlan id 1 ip saddr 10.0.0.1
rule.c:2870:5: runtime error: index 2 out of bounds for type 'stmt *[*]'
=================================================================
==1043==ERROR: AddressSanitizer: dynamic-stack-buffer-overflow on address 0x7ffdd69c1350 at pc 0x7f1036f53330 bp 0x7ffdd69c1300 sp 0x7ffdd69c12f8 WRITE of size 8 at 0x7ffdd69c1350 thread T0
#0 0x7f1036f5332f in payload_try_merge /home/mbr/nftables/src/rule.c:2870
#1 0x7f1036f534b7 in rule_postprocess /home/mbr/nftables/src/rule.c:2885
#2 0x7f1036fb2785 in rule_evaluate /home/mbr/nftables/src/evaluate.c:3744
#3 0x7f1036fb627b in cmd_evaluate_add /home/mbr/nftables/src/evaluate.c:3982
#4 0x7f1036fbb9e9 in cmd_evaluate /home/mbr/nftables/src/evaluate.c:4462
#5 0x7f10370652d2 in nft_evaluate /home/mbr/nftables/src/libnftables.c:414
#6 0x7f1037065ba1 in nft_run_cmd_from_buffer /home/mbr/nftables/src/libnftables.c:447--- include/rule.h | 3 +++ src/evaluate.c | 9 +++++---- src/rule.c | 7 +++++++ 3 files changed, 15 insertions(+), 4 deletions(-)
include/rule.h +3 -0
@@ -280,6 +280,9 @@ extern void rule_print(const struct rule *rule, struct output_ctx *octx);extern struct rule *rule_lookup (const struct chain *chain,uint64_t handle);extern struct rule *rule_lookup_by_index (const struct chain *chain,uint64_t index); +void rule_stmt_insert_at (struct rule *rule,struct stmt *nstmt, +struct stmt *stmt); +/** * struct set - nftables set
src/evaluate.c +5 -4
@@ -659,7 +659,7 @@ static int resolve_protocol_conflict(struct eval_ctx *ctx,if (err <0 )return err; -list_add_tail (&nstmt->list, &ctx->stmt->list); +rule_stmt_insert_at (ctx->rule, nstmt, ctx->stmt); }assert (base <=PROTO_BASE_MAX );
@@ -673,7 +673,7 @@ static int resolve_protocol_conflict(struct eval_ctx *ctx,return 1 ; payload->payload.offset += ctx->pctx.protocol[base].offset; -list_add_tail (&nstmt->list, &ctx->stmt->list); +rule_stmt_insert_at (ctx->rule, nstmt, ctx->stmt);return 0 ; }
@@ -698,7 +698,8 @@ static int __expr_evaluate_payload(struct eval_ctx *ctx, struct expr *expr)if (desc ==NULL ) {if (payload_gen_dependency (ctx, payload, &nstmt) <0 )return -1 ; -list_add_tail (&nstmt->list, &ctx->stmt->list); + +rule_stmt_insert_at (ctx->rule, nstmt, ctx->stmt); }else {/* No conflict: Same payload protocol as context, adjust offset * if needed.
@@ -840,8 +841,8 @@ static int ct_gen_nh_dependency(struct eval_ctx *ctx, struct expr *ct)relational_expr_pctx_update (&ctx->pctx, dep); nstmt =expr_stmt_alloc (&dep->location, dep); +rule_stmt_insert_at (ctx->rule, nstmt, ctx->stmt); -list_add_tail (&nstmt->list, &ctx->stmt->list);return 0 ; }
src/rule.c +7 -0
@@ -686,6 +686,13 @@ struct rule *rule_lookup_by_index(const struct chain *chain, uint64_t index)return NULL ; } +void rule_stmt_insert_at (struct rule *rule,struct stmt *nstmt, +struct stmt *stmt) +{ +list_add_tail (&nstmt->list, &stmt->list); + rule->num_stmts++; +} +struct scope *scope_alloc (void ) {struct scope *scope =xzalloc (sizeof (struct scope ));
Signature · 1 line
2.20.1
Pablo Neira Ayuso
maintainerPATCH 2/2 src: add rule_stmt_append() and use it
This helper function adds a statement at the end of the rule statement list and it updates the rule statement counter.
--- include/rule.h | 1 + src/netlink_delinearize.c | 7 +++---- src/parser_json.c | 6 ++---- src/rule.c | 6 ++++++ src/xt.c | 4 ++-- 5 files changed, 14 insertions(+), 10 deletions(-)
include/rule.h +1 -0
@@ -280,6 +280,7 @@ extern void rule_print(const struct rule *rule, struct output_ctx *octx);extern struct rule *rule_lookup (const struct chain *chain,uint64_t handle);extern struct rule *rule_lookup_by_index (const struct chain *chain,uint64_t index); +void rule_stmt_append (struct rule *rule,struct stmt *stmt);void rule_stmt_insert_at (struct rule *rule,struct stmt *nstmt,struct stmt *stmt);
src/netlink_delinearize.c +3 -4
@@ -563,8 +563,7 @@ static void netlink_parse_payload_stmt(struct netlink_parse_ctx *ctx,payload_init_raw (expr, base, offset, len); stmt =payload_stmt_alloc (loc, expr, val); - -list_add_tail (&stmt->list, &ctx->rule->stmts); +rule_stmt_append (ctx->rule, stmt); } static void netlink_parse_payload(struct netlink_parse_ctx *ctx,
@@ -615,7 +614,7 @@ static void netlink_parse_exthdr(struct netlink_parse_ctx *ctx,expr_set_type (val, expr->dtype, expr->byteorder); stmt =exthdr_stmt_alloc (loc, expr, val); -list_add_tail (&stmt->list, &ctx->rule->stmts); +rule_stmt_append (ctx->rule, stmt); } }
@@ -1672,7 +1671,7 @@ static int netlink_parse_rule_expr(struct nftnl_expr *nle, void *arg)if (err <0 )return err;if (ctx->stmt !=NULL ) { -list_add_tail (&ctx->stmt->list, &ctx->rule->stmts); +rule_stmt_append (ctx->rule, ctx->stmt); ctx->stmt =NULL ; }return 0 ;
src/parser_json.c +2 -4
@@ -2731,8 +2731,7 @@ static struct cmd *json_parse_cmd_add_rule(struct json_ctx *ctx, json_t *root,return NULL ; } - rule->num_stmts++; -list_add_tail (&stmt->list, &rule->stmts); +rule_stmt_append (rule, stmt); }if (op ==CMD_ADD )
@@ -3404,8 +3403,7 @@ static struct cmd *json_parse_cmd_replace(struct json_ctx *ctx,return NULL ; } - rule->num_stmts++; -list_add_tail (&stmt->list, &rule->stmts); +rule_stmt_append (rule, stmt); }if (op ==CMD_REPLACE )
src/rule.c +6 -0
@@ -686,6 +686,12 @@ struct rule *rule_lookup_by_index(const struct chain *chain, uint64_t index)return NULL ; } +void rule_stmt_append (struct rule *rule,struct stmt *stmt) +{ +list_add_tail (&stmt->list, &rule->stmts); + rule->num_stmts++; +} +void rule_stmt_insert_at (struct rule *rule,struct stmt *nstmt,struct stmt *stmt) {
src/xt.c +2 -2
@@ -238,7 +238,7 @@ void netlink_parse_match(struct netlink_parse_ctx *ctx, stmt->xt.name =strdup (name); stmt->xt.type =NFT_XT_MATCH ;#endif -list_add_tail (&stmt->list, &ctx->rule->stmts); +rule_stmt_append (ctx->rule, stmt); } void netlink_parse_target(struct netlink_parse_ctx *ctx,
@@ -283,7 +283,7 @@ void netlink_parse_target(struct netlink_parse_ctx *ctx, stmt->xt.name =strdup (name); stmt->xt.type =NFT_XT_TARGET ;#endif -list_add_tail (&stmt->list, &ctx->rule->stmts); +rule_stmt_append (ctx->rule, stmt); }#ifdef HAVE_LIBXTABLES
Signature · 1 line
2.20.1