From: Pablo Neira Ayuso <pablo@netfilter.org>
Date: Tue, 11 Sep 2012 15:46:19 +0000 (+0200)
Subject: netfilter: ctnetlink: fix module auto-load in ctnetlink_parse_nat
X-Git-Tag: v3.7-rc1~145^2~177^2
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=c7cbb9173d3c6d41cbfbca451902d66fe6440cbb;p=platform%2Fkernel%2Flinux-3.10.git

netfilter: ctnetlink: fix module auto-load in ctnetlink_parse_nat

(c7232c9 netfilter: add protocol independent NAT core) added
incorrect locking for the module auto-load case in ctnetlink_parse_nat.

That function is always called from ctnetlink_create_conntrack which
requires no locking.

Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
---

diff --git a/net/netfilter/nf_conntrack_netlink.c b/net/netfilter/nf_conntrack_netlink.c
index a205bd6..090d267 100644
--- a/net/netfilter/nf_conntrack_netlink.c
+++ b/net/netfilter/nf_conntrack_netlink.c
@@ -1120,16 +1120,13 @@ ctnetlink_parse_nat_setup(struct nf_conn *ct,
 	if (err == -EAGAIN) {
 #ifdef CONFIG_MODULES
 		rcu_read_unlock();
-		spin_unlock_bh(&nf_conntrack_lock);
 		nfnl_unlock();
 		if (request_module("nf-nat-%u", nf_ct_l3num(ct)) < 0) {
 			nfnl_lock();
-			spin_lock_bh(&nf_conntrack_lock);
 			rcu_read_lock();
 			return -EOPNOTSUPP;
 		}
 		nfnl_lock();
-		spin_lock_bh(&nf_conntrack_lock);
 		rcu_read_lock();
 #else
 		err = -EOPNOTSUPP;