From: Patrick McHardy <kaber@trash.net>
To: pablo@netfilter.org
Cc: netfilter-devel@vger.kernel.org
Subject: [PATCH 09/13] netfilter: nf_tables: perform flags validation before table allocation
Date: Thu, 9 Jan 2014 18:42:39 +0000 [thread overview]
Message-ID: <1389292963-4089-10-git-send-email-kaber@trash.net> (raw)
In-Reply-To: <1389292963-4089-1-git-send-email-kaber@trash.net>
Simplifies error handling. Additionally use the correct type u32 for the
host byte order flags value.
Signed-off-by: Patrick McHardy <kaber@trash.net>
---
net/netfilter/nf_tables_api.c | 22 +++++++++-------------
1 file changed, 9 insertions(+), 13 deletions(-)
diff --git a/net/netfilter/nf_tables_api.c b/net/netfilter/nf_tables_api.c
index c8ca3b8..88f9c94 100644
--- a/net/netfilter/nf_tables_api.c
+++ b/net/netfilter/nf_tables_api.c
@@ -366,7 +366,7 @@ static int nf_tables_updtable(struct sock *nlsk, struct sk_buff *skb,
int family = nfmsg->nfgen_family, ret = 0;
if (nla[NFTA_TABLE_FLAGS]) {
- __be32 flags;
+ u32 flags;
flags = ntohl(nla_get_be32(nla[NFTA_TABLE_FLAGS]));
if (flags & ~NFT_TABLE_F_DORMANT)
@@ -402,6 +402,7 @@ static int nf_tables_newtable(struct sock *nlsk, struct sk_buff *skb,
struct nft_table *table;
struct net *net = sock_net(skb->sk);
int family = nfmsg->nfgen_family;
+ u32 flags = 0;
afi = nf_tables_afinfo_lookup(net, family, true);
if (IS_ERR(afi))
@@ -423,6 +424,12 @@ static int nf_tables_newtable(struct sock *nlsk, struct sk_buff *skb,
return nf_tables_updtable(nlsk, skb, nlh, nla, afi, table);
}
+ if (nla[NFTA_TABLE_FLAGS]) {
+ flags = ntohl(nla_get_be32(nla[NFTA_TABLE_FLAGS]));
+ if (flags & ~NFT_TABLE_F_DORMANT)
+ return -EINVAL;
+ }
+
table = kzalloc(sizeof(*table) + nla_len(name), GFP_KERNEL);
if (table == NULL)
return -ENOMEM;
@@ -430,18 +437,7 @@ static int nf_tables_newtable(struct sock *nlsk, struct sk_buff *skb,
nla_strlcpy(table->name, name, nla_len(name));
INIT_LIST_HEAD(&table->chains);
INIT_LIST_HEAD(&table->sets);
-
- if (nla[NFTA_TABLE_FLAGS]) {
- __be32 flags;
-
- flags = ntohl(nla_get_be32(nla[NFTA_TABLE_FLAGS]));
- if (flags & ~NFT_TABLE_F_DORMANT) {
- kfree(table);
- return -EINVAL;
- }
-
- table->flags |= flags;
- }
+ table->flags = flags;
list_add_tail(&table->list, &afi->tables);
nf_tables_table_notify(skb, nlh, table, NFT_MSG_NEWTABLE, family);
--
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 ` Patrick McHardy [this message]
2014-01-09 18:42 ` [PATCH 10/13] netfilter: nf_tables: take AF module reference when creating a table Patrick McHardy
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-10-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).