From: Patrick McHardy <kaber@trash.net>
To: pablo@netfilter.org
Cc: netfilter-devel@vger.kernel.org
Subject: [PATCH 10/13] netfilter: nf_tables: take AF module reference when creating a table
Date: Thu, 9 Jan 2014 18:42:40 +0000 [thread overview]
Message-ID: <1389292963-4089-11-git-send-email-kaber@trash.net> (raw)
In-Reply-To: <1389292963-4089-1-git-send-email-kaber@trash.net>
The table refers to data of the AF module, so we need to make sure the
module isn't unloaded while the table exists.
Signed-off-by: Patrick McHardy <kaber@trash.net>
---
net/netfilter/nf_tables_api.c | 8 +++++++-
1 file changed, 7 insertions(+), 1 deletion(-)
diff --git a/net/netfilter/nf_tables_api.c b/net/netfilter/nf_tables_api.c
index 88f9c94..c352614 100644
--- a/net/netfilter/nf_tables_api.c
+++ b/net/netfilter/nf_tables_api.c
@@ -430,9 +430,14 @@ static int nf_tables_newtable(struct sock *nlsk, struct sk_buff *skb,
return -EINVAL;
}
+ if (!try_module_get(afi->owner))
+ return -EAFNOSUPPORT;
+
table = kzalloc(sizeof(*table) + nla_len(name), GFP_KERNEL);
- if (table == NULL)
+ if (table == NULL) {
+ module_put(afi->owner);
return -ENOMEM;
+ }
nla_strlcpy(table->name, name, nla_len(name));
INIT_LIST_HEAD(&table->chains);
@@ -468,6 +473,7 @@ static int nf_tables_deltable(struct sock *nlsk, struct sk_buff *skb,
list_del(&table->list);
nf_tables_table_notify(skb, nlh, table, NFT_MSG_DELTABLE, family);
kfree(table);
+ module_put(afi->owner);
return 0;
}
--
1.8.4.2
next prev parent reply other threads:[~2014-01-09 18:43 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-01-09 18:42 [PATCH 00/13] netfilter: nf_tables: bug fixes and minor cleanups Patrick McHardy
2014-01-09 18:42 ` [PATCH 01/13] netfilter: nf_tables: split chain policy validation from actually setting it Patrick McHardy
2014-01-09 18:42 ` [PATCH 02/13] netfilter: nf_tables: restore chain change atomicity Patrick McHardy
2014-01-09 18:42 ` [PATCH 03/13] netfilter: nf_tables: fix check for table overflow Patrick McHardy
2014-01-09 18:42 ` [PATCH 04/13] netfilter: nf_tables: fix chain type module reference handling Patrick McHardy
2014-01-09 18:42 ` [PATCH 05/13] netfilter: nf_tables: add missing module references to chain types Patrick McHardy
2014-01-09 18:42 ` [PATCH 06/13] netfilter: nf_tables: replay request after dropping locks to load chain type Patrick McHardy
2014-01-09 18:42 ` [PATCH 07/13] netfilter: nf_tables: constify chain type definitions and pointers Patrick McHardy
2014-01-09 18:42 ` [PATCH 08/13] netfilter: nf_tables: minor nf_chain_type cleanups Patrick McHardy
2014-01-09 18:42 ` [PATCH 09/13] netfilter: nf_tables: perform flags validation before table allocation Patrick McHardy
2014-01-09 18:42 ` Patrick McHardy [this message]
2014-01-09 18:42 ` [PATCH 11/13] netfilter: nf_tables: prohibit deletion of a table with existing sets Patrick McHardy
2014-01-09 18:42 ` [PATCH 12/13] netfilter: nf_tables: unininline nft_trace_packet() Patrick McHardy
2014-01-09 18:42 ` [PATCH 13/13] netfilter: nf_tables: rename nft_do_chain_pktinfo() to nft_do_chain() Patrick McHardy
2014-01-10 0:25 ` [PATCH 00/13] netfilter: nf_tables: bug fixes and minor cleanups Pablo Neira Ayuso
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1389292963-4089-11-git-send-email-kaber@trash.net \
--to=kaber@trash.net \
--cc=netfilter-devel@vger.kernel.org \
--cc=pablo@netfilter.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).