* [PATCH nf-next] nf_tables: reduce chain type table size
@ 2017-06-14 9:51 Florian Westphal
2017-06-19 17:20 ` Pablo Neira Ayuso
0 siblings, 1 reply; 2+ messages in thread
From: Florian Westphal @ 2017-06-14 9:51 UTC (permalink / raw)
To: netfilter-devel; +Cc: Florian Westphal
text data bss dec hex filename
old: 151590 2240 1152 154982 25d66 net/netfilter/nf_tables_api.o
new: 151666 2240 416 154322 25ad2 net/netfilter/nf_tables_api.o
Signed-off-by: Florian Westphal <fw@strlen.de>
---
net/netfilter/nf_tables_api.c | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/net/netfilter/nf_tables_api.c b/net/netfilter/nf_tables_api.c
index bc8f03a53734..5f3339978f6b 100644
--- a/net/netfilter/nf_tables_api.c
+++ b/net/netfilter/nf_tables_api.c
@@ -387,7 +387,7 @@ static inline u64 nf_tables_alloc_handle(struct nft_table *table)
return ++table->hgenerator;
}
-static const struct nf_chain_type *chain_type[AF_MAX][NFT_CHAIN_T_MAX];
+static const struct nf_chain_type *chain_type[NFPROTO_NUMPROTO][NFT_CHAIN_T_MAX];
static const struct nf_chain_type *
__nf_tables_chain_type_lookup(int family, const struct nlattr *nla)
@@ -870,6 +870,9 @@ int nft_register_chain_type(const struct nf_chain_type *ctype)
{
int err = 0;
+ if (WARN_ON(ctype->family >= NFPROTO_NUMPROTO))
+ return -EINVAL;
+
nfnl_lock(NFNL_SUBSYS_NFTABLES);
if (chain_type[ctype->family][ctype->type] != NULL) {
err = -EBUSY;
--
2.13.0
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH nf-next] nf_tables: reduce chain type table size
2017-06-14 9:51 [PATCH nf-next] nf_tables: reduce chain type table size Florian Westphal
@ 2017-06-19 17:20 ` Pablo Neira Ayuso
0 siblings, 0 replies; 2+ messages in thread
From: Pablo Neira Ayuso @ 2017-06-19 17:20 UTC (permalink / raw)
To: Florian Westphal; +Cc: netfilter-devel
On Wed, Jun 14, 2017 at 11:51:29AM +0200, Florian Westphal wrote:
> text data bss dec hex filename
> old: 151590 2240 1152 154982 25d66 net/netfilter/nf_tables_api.o
> new: 151666 2240 416 154322 25ad2 net/netfilter/nf_tables_api.o
Applied, thanks Florian.
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2017-06-19 17:20 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2017-06-14 9:51 [PATCH nf-next] nf_tables: reduce chain type table size Florian Westphal
2017-06-19 17:20 ` Pablo Neira Ayuso
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).