Techwizz/kernel-fxtec-pro1x
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

[NETFILTER]: nf_conntrack: simplify l4 protocol array allocation

Browse source 
The retrying after an allocation failure is not necessary anymore
since we're holding the mutex the entire time, for the same
reason the double allocation race can't happen anymore.

Signed-off-by: Patrick McHardy <kaber@trash.net>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Patrick McHardy 2007-03-14 16:39:07 -07:00 • committed by David S. Miller
parent 0661cca9c2
commit c6a1e615d1
1 changed files with 12 additions and 25 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

37
net/netfilter/nf_conntrack_proto.c
View file

@ -281,47 +281,34 @@ int nf_conntrack_l4proto_register(struct nf_conntrack_l4proto *l4proto)
return -EBUSY; return -EBUSY;
mutex_lock(&nf_ct_proto_mutex); mutex_lock(&nf_ct_proto_mutex);
retry: if (!nf_ct_protos[l4proto->l3proto]) {
if (nf_ct_protos[l4proto->l3proto]) {
if (nf_ct_protos[l4proto->l3proto][l4proto->l4proto]
!= &nf_conntrack_l4proto_generic) {
ret = -EBUSY;
goto out_unlock;
}
} else {
/* l3proto may be loaded latter. */ /* l3proto may be loaded latter. */
struct nf_conntrack_l4proto **proto_array; struct nf_conntrack_l4proto **proto_array;
int i; int i;
proto_array = (struct nf_conntrack_l4proto **) proto_array = kmalloc(MAX_NF_CT_PROTO *
kmalloc(MAX_NF_CT_PROTO * sizeof(struct nf_conntrack_l4proto *),
sizeof(struct nf_conntrack_l4proto *), GFP_KERNEL);
GFP_KERNEL);
if (proto_array == NULL) { if (proto_array == NULL) {
ret = -ENOMEM; ret = -ENOMEM;
goto out_unlock; goto out_unlock;
} }
for (i = 0; i < MAX_NF_CT_PROTO; i++) for (i = 0; i < MAX_NF_CT_PROTO; i++)
proto_array[i] = &nf_conntrack_l4proto_generic; proto_array[i] = &nf_conntrack_l4proto_generic;
nf_ct_protos[l4proto->l3proto] = proto_array;
if (nf_ct_protos[l4proto->l3proto]) } else if (nf_ct_protos[l4proto->l3proto][l4proto->l4proto] !=
/* bad timing, but no problem */ &nf_conntrack_l4proto_generic) {
kfree(proto_array); ret = -EBUSY;
else goto out_unlock;
nf_ct_protos[l4proto->l3proto] = proto_array;
/*
* Just once because array is never freed until unloading
* nf_conntrack.ko
*/
goto retry;
} }
ret = nf_ct_l4proto_register_sysctl(l4proto); ret = nf_ct_l4proto_register_sysctl(l4proto);
if (ret < 0) if (ret < 0)
goto out_unlock; goto out_unlock;
rcu_assign_pointer(nf_ct_protos[l4proto->l3proto][l4proto->l4proto], l4proto); rcu_assign_pointer(nf_ct_protos[l4proto->l3proto][l4proto->l4proto],
l4proto);
out_unlock: out_unlock:
mutex_unlock(&nf_ct_proto_mutex); mutex_unlock(&nf_ct_proto_mutex);