diff options
| -rw-r--r-- | src/expr.c | 3 | ||||
| -rw-r--r-- | src/expr/match.c | 8 | ||||
| -rw-r--r-- | src/expr/target.c | 8 | ||||
| -rw-r--r-- | src/expr_ops.h | 1 |
4 files changed, 20 insertions, 0 deletions
@@ -49,6 +49,9 @@ EXPORT_SYMBOL(nft_rule_expr_alloc); void nft_rule_expr_free(struct nft_rule_expr *expr) { + if (expr->ops->free) + expr->ops->free(expr); + xfree(expr); } EXPORT_SYMBOL(nft_rule_expr_free); diff --git a/src/expr/match.c b/src/expr/match.c index db2b987..5d02ee7 100644 --- a/src/expr/match.c +++ b/src/expr/match.c @@ -258,10 +258,18 @@ nft_rule_expr_match_snprintf(char *buf, size_t len, uint32_t type, return -1; } +static void nft_rule_expr_match_free(struct nft_rule_expr *e) +{ + struct nft_expr_match *match = nft_expr_data(e); + + xfree(match->data); +} + struct expr_ops expr_ops_match = { .name = "match", .alloc_len = sizeof(struct nft_expr_match), .max_attr = NFTA_MATCH_MAX, + .free = nft_rule_expr_match_free, .set = nft_rule_expr_match_set, .get = nft_rule_expr_match_get, .parse = nft_rule_expr_match_parse, diff --git a/src/expr/target.c b/src/expr/target.c index 7994bcd..20bf2af 100644 --- a/src/expr/target.c +++ b/src/expr/target.c @@ -260,10 +260,18 @@ nft_rule_expr_target_snprintf(char *buf, size_t len, uint32_t type, return -1; } +static void nft_rule_expr_target_free(struct nft_rule_expr *e) +{ + struct nft_expr_target *target = nft_expr_data(e); + + xfree(target->data); +} + struct expr_ops expr_ops_target = { .name = "target", .alloc_len = sizeof(struct nft_expr_target), .max_attr = NFTA_TARGET_MAX, + .free = nft_rule_expr_target_free, .set = nft_rule_expr_target_set, .get = nft_rule_expr_target_get, .parse = nft_rule_expr_target_parse, diff --git a/src/expr_ops.h b/src/expr_ops.h index becc85a..26e0b82 100644 --- a/src/expr_ops.h +++ b/src/expr_ops.h @@ -23,6 +23,7 @@ struct expr_ops { const char *name; uint32_t alloc_len; int max_attr; + void (*free)(struct nft_rule_expr *e); int (*set)(struct nft_rule_expr *e, uint16_t type, const void *data, uint32_t data_len); const void *(*get)(const struct nft_rule_expr *e, uint16_t type, uint32_t *data_len); int (*parse)(struct nft_rule_expr *e, struct nlattr *attr); |