git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
netfilter: nf_conntrack: use SLAB_DESTROY_BY_RCU and get rid of call_rcu()
[pandora-kernel.git]
/
net
/
netfilter
/
nf_conntrack_helper.c
diff --git
a/net/netfilter/nf_conntrack_helper.c
b/net/netfilter/nf_conntrack_helper.c
index
a51bdac
..
30b8e90
100644
(file)
--- a/
net/netfilter/nf_conntrack_helper.c
+++ b/
net/netfilter/nf_conntrack_helper.c
@@
-142,6
+142,7
@@
int nf_conntrack_helper_register(struct nf_conntrack_helper *me)
BUG_ON(me->expect_policy == NULL);
BUG_ON(me->expect_class_max >= NF_CT_MAX_EXPECT_CLASSES);
BUG_ON(me->expect_policy == NULL);
BUG_ON(me->expect_class_max >= NF_CT_MAX_EXPECT_CLASSES);
+ BUG_ON(strlen(me->name) > NF_CT_HELPER_NAME_LEN - 1);
mutex_lock(&nf_ct_helper_mutex);
hlist_add_head_rcu(&me->hnode, &nf_ct_helper_hash[h]);
mutex_lock(&nf_ct_helper_mutex);
hlist_add_head_rcu(&me->hnode, &nf_ct_helper_hash[h]);
@@
-158,6
+159,7
@@
static void __nf_conntrack_helper_unregister(struct nf_conntrack_helper *me,
struct nf_conntrack_tuple_hash *h;
struct nf_conntrack_expect *exp;
const struct hlist_node *n, *next;
struct nf_conntrack_tuple_hash *h;
struct nf_conntrack_expect *exp;
const struct hlist_node *n, *next;
+ const struct hlist_nulls_node *nn;
unsigned int i;
/* Get rid of expectations */
unsigned int i;
/* Get rid of expectations */
@@
-174,10
+176,10
@@
static void __nf_conntrack_helper_unregister(struct nf_conntrack_helper *me,
}
/* Get rid of expecteds, set helpers to NULL. */
}
/* Get rid of expecteds, set helpers to NULL. */
- hlist_for_each_entry(h, n
, &net->ct.unconfirmed, h
node)
+ hlist_for_each_entry(h, n
n, &net->ct.unconfirmed, hn
node)
unhelp(h, me);
for (i = 0; i < nf_conntrack_htable_size; i++) {
unhelp(h, me);
for (i = 0; i < nf_conntrack_htable_size; i++) {
- hlist_
for_each_entry(h, n, &net->ct.hash[i], h
node)
+ hlist_
nulls_for_each_entry(h, nn, &net->ct.hash[i], hn
node)
unhelp(h, me);
}
}
unhelp(h, me);
}
}
@@
-217,7
+219,7
@@
int nf_conntrack_helper_init(void)
nf_ct_helper_hsize = 1; /* gets rounded up to use one page */
nf_ct_helper_hash = nf_ct_alloc_hashtable(&nf_ct_helper_hsize,
nf_ct_helper_hsize = 1; /* gets rounded up to use one page */
nf_ct_helper_hash = nf_ct_alloc_hashtable(&nf_ct_helper_hsize,
- &nf_ct_helper_vmalloc);
+ &nf_ct_helper_vmalloc
, 0
);
if (!nf_ct_helper_hash)
return -ENOMEM;
if (!nf_ct_helper_hash)
return -ENOMEM;