diff options
author | Pablo Neira Ayuso <pablo@netfilter.org> | 2014-06-11 14:27:46 +0200 |
---|---|---|
committer | Pablo Neira Ayuso <pablo@netfilter.org> | 2014-06-16 13:08:04 +0200 |
commit | 3d9b142131ef0cde259dbac5cce36f570fcb4902 (patch) | |
tree | 2c33862bf562b7dc54bad8fe1fa55859e757806e /net/netfilter | |
parent | ac904ac835ac7879a9374dc3ef1e5cb75d9c7ceb (diff) | |
download | linux-stable-3d9b142131ef0cde259dbac5cce36f570fcb4902.tar.gz linux-stable-3d9b142131ef0cde259dbac5cce36f570fcb4902.tar.bz2 linux-stable-3d9b142131ef0cde259dbac5cce36f570fcb4902.zip |
netfilter: nft_compat: call {target, match}->destroy() to cleanup entry
Otherwise, the reference to external objects (eg. modules) are not
released when the rules are removed.
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
Diffstat (limited to 'net/netfilter')
-rw-r--r-- | net/netfilter/nft_compat.c | 18 |
1 files changed, 18 insertions, 0 deletions
diff --git a/net/netfilter/nft_compat.c b/net/netfilter/nft_compat.c index 8a779be832fb..1840989092ed 100644 --- a/net/netfilter/nft_compat.c +++ b/net/netfilter/nft_compat.c @@ -195,6 +195,15 @@ static void nft_target_destroy(const struct nft_ctx *ctx, const struct nft_expr *expr) { struct xt_target *target = expr->ops->data; + void *info = nft_expr_priv(expr); + struct xt_tgdtor_param par; + + par.net = ctx->net; + par.target = target; + par.targinfo = info; + par.family = ctx->afi->family; + if (par.target->destroy != NULL) + par.target->destroy(&par); module_put(target->me); } @@ -382,6 +391,15 @@ static void nft_match_destroy(const struct nft_ctx *ctx, const struct nft_expr *expr) { struct xt_match *match = expr->ops->data; + void *info = nft_expr_priv(expr); + struct xt_mtdtor_param par; + + par.net = ctx->net; + par.match = match; + par.matchinfo = info; + par.family = ctx->afi->family; + if (par.match->destroy != NULL) + par.match->destroy(&par); module_put(match->me); } |