[PATCH nf] netfilter: cthelper: no need for rcu read side on helper creation

[Pablo Neira Ayuso]

This code is already protected by the nfnl_lock mutex.

Signed-off-by: Pablo Neira Ayuso <pa...@netfilter.org>
---
 net/netfilter/nfnetlink_cthelper.c | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/net/netfilter/nfnetlink_cthelper.c 
b/net/netfilter/nfnetlink_cthelper.c
index f0241a1e1083..3166406d68d3 100644
--- a/net/netfilter/nfnetlink_cthelper.c
+++ b/net/netfilter/nfnetlink_cthelper.c
@@ -306,9 +306,8 @@ static int nfnl_cthelper_new(struct net *net, struct sock 
*nfnl,
        if (ret < 0)
                return ret;
 
-       rcu_read_lock();
        for (i = 0; i < nf_ct_helper_hsize && !helper; i++) {
-               hlist_for_each_entry_rcu(cur, &nf_ct_helper_hash[i], hnode) {
+               hlist_for_each_entry(cur, &nf_ct_helper_hash[i], hnode) {
 
                        /* skip non-userspace conntrack helpers. */
                        if (!(cur->flags & NF_CT_HELPER_F_USERSPACE))
@@ -330,16 +329,12 @@ static int nfnl_cthelper_new(struct net *net, struct sock 
*nfnl,
                        break;
                }
        }
-       rcu_read_unlock();
 
        if (helper == NULL)
                ret = nfnl_cthelper_create(tb, &tuple);
        else
                ret = nfnl_cthelper_update(tb, helper);
-
-       return ret;
 err:
-       rcu_read_unlock();
        return ret;
 }
 
-- 
2.1.4

--
To unsubscribe from this list: send the line "unsubscribe netfilter-devel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html