AuxXxilium/linux_dsm_epyc7002
1
0
Fork 0
mirror of https://github.com/AuxXxilium/linux_dsm_epyc7002.git synced 2025-02-07 18:05:21 +07:00
Code Issues Actions Packages Projects Releases Wiki Activity

netfilter: conntrack: use NFPROTO_MAX to size array

Browse Source 
We don't support anything larger than NFPROTO_MAX, so we can shrink this a bit:

     text data  dec  hex filename
old: 8259 1096 9355 248b net/netfilter/nf_conntrack_proto.o
new: 8259  624 8883 22b3 net/netfilter/nf_conntrack_proto.o

Signed-off-by: Florian Westphal <fw@strlen.de>
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
This commit is contained in:
Florian Westphal 2017-06-14 11:54:07 +02:00 committed by Pablo Neira Ayuso
parent d53e3fc390
commit b7b5fda468
2 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
include/net/netfilter/nf_conntrack_l3proto.h
View File

@ -71,7 +71,7 @@ struct nf_conntrack_l3proto {
struct module *me; struct module *me;
}; };
extern struct nf_conntrack_l3proto __rcu *nf_ct_l3protos[AF_MAX]; extern struct nf_conntrack_l3proto __rcu *nf_ct_l3protos[NFPROTO_NUMPROTO];
#ifdef CONFIG_SYSCTL #ifdef CONFIG_SYSCTL
/* Protocol pernet registration. */ /* Protocol pernet registration. */
@ -100,7 +100,7 @@ extern struct nf_conntrack_l3proto nf_conntrack_l3proto_generic;
static inline struct nf_conntrack_l3proto * static inline struct nf_conntrack_l3proto *
__nf_ct_l3proto_find(u_int16_t l3proto) __nf_ct_l3proto_find(u_int16_t l3proto)
{ {
if (unlikely(l3proto >= AF_MAX)) if (unlikely(l3proto >= NFPROTO_NUMPROTO))
return &nf_conntrack_l3proto_generic; return &nf_conntrack_l3proto_generic;
return rcu_dereference(nf_ct_l3protos[l3proto]); return rcu_dereference(nf_ct_l3protos[l3proto]);
} }

18
net/netfilter/nf_conntrack_proto.c
View File

@ -28,8 +28,8 @@
#include <net/netfilter/nf_conntrack_l4proto.h> #include <net/netfilter/nf_conntrack_l4proto.h>
#include <net/netfilter/nf_conntrack_core.h> #include <net/netfilter/nf_conntrack_core.h>
static struct nf_conntrack_l4proto __rcu **nf_ct_protos[PF_MAX] __read_mostly; static struct nf_conntrack_l4proto __rcu **nf_ct_protos[NFPROTO_NUMPROTO] __read_mostly;
struct nf_conntrack_l3proto __rcu *nf_ct_l3protos[AF_MAX] __read_mostly; struct nf_conntrack_l3proto __rcu *nf_ct_l3protos[NFPROTO_NUMPROTO] __read_mostly;
EXPORT_SYMBOL_GPL(nf_ct_l3protos); EXPORT_SYMBOL_GPL(nf_ct_l3protos);
static DEFINE_MUTEX(nf_ct_proto_mutex); static DEFINE_MUTEX(nf_ct_proto_mutex);
@ -68,7 +68,7 @@ nf_ct_unregister_sysctl(struct ctl_table_header **header,
struct nf_conntrack_l4proto * struct nf_conntrack_l4proto *
__nf_ct_l4proto_find(u_int16_t l3proto, u_int8_t l4proto) __nf_ct_l4proto_find(u_int16_t l3proto, u_int8_t l4proto)
{ {
if (unlikely(l3proto >= AF_MAX || nf_ct_protos[l3proto] == NULL)) if (unlikely(l3proto >= NFPROTO_NUMPROTO || nf_ct_protos[l3proto] == NULL))
return &nf_conntrack_l4proto_generic; return &nf_conntrack_l4proto_generic;
return rcu_dereference(nf_ct_protos[l3proto][l4proto]); return rcu_dereference(nf_ct_protos[l3proto][l4proto]);
@ -212,7 +212,7 @@ int nf_ct_l3proto_register(struct nf_conntrack_l3proto *proto)
int ret = 0; int ret = 0;
struct nf_conntrack_l3proto *old; struct nf_conntrack_l3proto *old;
if (proto->l3proto >= AF_MAX) if (proto->l3proto >= NFPROTO_NUMPROTO)
return -EBUSY; return -EBUSY;
if (proto->tuple_to_nlattr && !proto->nlattr_tuple_size) if (proto->tuple_to_nlattr && !proto->nlattr_tuple_size)
@ -254,7 +254,7 @@ EXPORT_SYMBOL_GPL(nf_ct_l3proto_pernet_register);
void nf_ct_l3proto_unregister(struct nf_conntrack_l3proto *proto) void nf_ct_l3proto_unregister(struct nf_conntrack_l3proto *proto)
{ {
BUG_ON(proto->l3proto >= AF_MAX); BUG_ON(proto->l3proto >= NFPROTO_NUMPROTO);
mutex_lock(&nf_ct_proto_mutex); mutex_lock(&nf_ct_proto_mutex);
BUG_ON(rcu_dereference_protected(nf_ct_l3protos[proto->l3proto], BUG_ON(rcu_dereference_protected(nf_ct_l3protos[proto->l3proto],
@ -341,7 +341,7 @@ int nf_ct_l4proto_register_one(struct nf_conntrack_l4proto *l4proto)
{ {
int ret = 0; int ret = 0;
if (l4proto->l3proto >= PF_MAX) if (l4proto->l3proto >= ARRAY_SIZE(nf_ct_protos))
return -EBUSY; return -EBUSY;
if ((l4proto->to_nlattr && !l4proto->nlattr_size) || if ((l4proto->to_nlattr && !l4proto->nlattr_size) ||
@ -423,7 +423,7 @@ EXPORT_SYMBOL_GPL(nf_ct_l4proto_pernet_register_one);
static void __nf_ct_l4proto_unregister_one(struct nf_conntrack_l4proto *l4proto) static void __nf_ct_l4proto_unregister_one(struct nf_conntrack_l4proto *l4proto)
{ {
BUG_ON(l4proto->l3proto >= PF_MAX); BUG_ON(l4proto->l3proto >= ARRAY_SIZE(nf_ct_protos));
BUG_ON(rcu_dereference_protected( BUG_ON(rcu_dereference_protected(
nf_ct_protos[l4proto->l3proto][l4proto->l4proto], nf_ct_protos[l4proto->l3proto][l4proto->l4proto],
@ -556,7 +556,7 @@ void nf_conntrack_proto_pernet_fini(struct net *net)
int nf_conntrack_proto_init(void) int nf_conntrack_proto_init(void)
{ {
unsigned int i; unsigned int i;
for (i = 0; i < AF_MAX; i++) for (i = 0; i < NFPROTO_NUMPROTO; i++)
rcu_assign_pointer(nf_ct_l3protos[i], rcu_assign_pointer(nf_ct_l3protos[i],
&nf_conntrack_l3proto_generic); &nf_conntrack_l3proto_generic);
return 0; return 0;
@ -566,6 +566,6 @@ void nf_conntrack_proto_fini(void)
{ {
unsigned int i; unsigned int i;
/* free l3proto protocol tables */ /* free l3proto protocol tables */
for (i = 0; i < PF_MAX; i++) for (i = 0; i < ARRAY_SIZE(nf_ct_protos); i++)
kfree(nf_ct_protos[i]); kfree(nf_ct_protos[i]);
} }