diff options
author | Phil Sutter <phil@nwl.cc> | 2023-01-10 22:13:44 +0100 |
---|---|---|
committer | Phil Sutter <phil@nwl.cc> | 2023-01-13 17:11:18 +0100 |
commit | b83a0416cdc881c6ac35739cd858e4fe5fb2e04f (patch) | |
tree | 141ed75b27159564cc9714630e13690950066b9a | |
parent | 798499bdcfd3a745027c77687275b6a3abdd952e (diff) |
optimize: Clarify chain_optimize() array allocations
Arguments passed to sizeof() where deemed suspicious by covscan due to
the different type. Consistently specify size of an array 'a' using
'sizeof(*a) * nmemb'.
For the statement arrays in stmt_matrix, even use xzalloc_array() since
the item count is fixed and therefore can't be zero.
Fixes: fb298877ece27 ("src: add ruleset optimization infrastructure")
Signed-off-by: Phil Sutter <phil@nwl.cc>
-rw-r--r-- | src/optimize.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/src/optimize.c b/src/optimize.c index 32aed866..12cae00d 100644 --- a/src/optimize.c +++ b/src/optimize.c @@ -1113,10 +1113,11 @@ static int chain_optimize(struct nft_ctx *nft, struct list_head *rules) ctx->num_rules++; } - ctx->rule = xzalloc(sizeof(ctx->rule) * ctx->num_rules); - ctx->stmt_matrix = xzalloc(sizeof(struct stmt *) * ctx->num_rules); + ctx->rule = xzalloc(sizeof(*ctx->rule) * ctx->num_rules); + ctx->stmt_matrix = xzalloc(sizeof(*ctx->stmt_matrix) * ctx->num_rules); for (i = 0; i < ctx->num_rules; i++) - ctx->stmt_matrix[i] = xzalloc(sizeof(struct stmt *) * MAX_STMTS); + ctx->stmt_matrix[i] = xzalloc_array(MAX_STMTS, + sizeof(**ctx->stmt_matrix)); merge = xzalloc(sizeof(*merge) * ctx->num_rules); |