diff options
| author | Pablo Neira Ayuso | 2019-02-13 13:18:36 +0100 |
|---|---|---|
| committer | Pablo Neira Ayuso | 2019-02-27 10:41:24 +0100 |
| commit | b8e204006340b7aaf32bd2b9806c692f6e0cb38a (patch) | |
| tree | 0fc41be04455ce2cb1f19a6c9f5203fb8e92df5e /net/netfilter/nf_tables_api.c | |
| parent | net: sched: pie: fix 64-bit division (diff) | |
| download | kernel-qcow2-linux-b8e204006340b7aaf32bd2b9806c692f6e0cb38a.tar.gz kernel-qcow2-linux-b8e204006340b7aaf32bd2b9806c692f6e0cb38a.tar.xz kernel-qcow2-linux-b8e204006340b7aaf32bd2b9806c692f6e0cb38a.zip | |
netfilter: nft_compat: use .release_ops and remove list of extension
Add .release_ops, that is called in case of error at a later stage in
the expression initialization path, ie. .select_ops() has been already
set up operations and that needs to be undone. This allows us to unwind
.select_ops from the error path, ie. release the dynamic operations for
this extension.
Moreover, allocate one single operation instead of recycling them, this
comes at the cost of consuming a bit more memory per rule, but it
simplifies the infrastructure.
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
Diffstat (limited to 'net/netfilter/nf_tables_api.c')
| -rw-r--r-- | net/netfilter/nf_tables_api.c | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/net/netfilter/nf_tables_api.c b/net/netfilter/nf_tables_api.c index e1a88ba2249e..faf6bd10a19f 100644 --- a/net/netfilter/nf_tables_api.c +++ b/net/netfilter/nf_tables_api.c @@ -2172,6 +2172,7 @@ struct nft_expr *nft_expr_init(const struct nft_ctx *ctx, { struct nft_expr_info info; struct nft_expr *expr; + struct module *owner; int err; err = nf_tables_expr_parse(ctx, nla, &info); @@ -2191,7 +2192,11 @@ struct nft_expr *nft_expr_init(const struct nft_ctx *ctx, err3: kfree(expr); err2: - module_put(info.ops->type->owner); + owner = info.ops->type->owner; + if (info.ops->type->release_ops) + info.ops->type->release_ops(info.ops); + + module_put(owner); err1: return ERR_PTR(err); } |