diff options
| author | Pablo Neira Ayuso <pablo@netfilter.org> | 2012-03-06 02:22:51 +0100 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2012-03-06 20:43:49 +0100 |
| commit | 8be619d1e430fd87a02587a2a6830b692cb91b84 (patch) | |
| tree | 580ca289a8e79a18dc8140e2077d67d29bebcae5 /net | |
| parent | netfilter: ebtables: fix wrong name length while copying to user-space (diff) | |
| download | linux-8be619d1e430fd87a02587a2a6830b692cb91b84.tar.xz linux-8be619d1e430fd87a02587a2a6830b692cb91b84.zip | |
netfilter: ctnetlink: remove incorrect spin_[un]lock_bh on NAT module autoload
Since 7d367e0, ctnetlink_new_conntrack is called without holding
the nf_conntrack_lock spinlock. Thus, ctnetlink_parse_nat_setup
does not require to release that spinlock anymore in the NAT module
autoload case.
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net')
| -rw-r--r-- | net/netfilter/nf_conntrack_netlink.c | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/net/netfilter/nf_conntrack_netlink.c b/net/netfilter/nf_conntrack_netlink.c index 30c9d4ca0218..10687692831e 100644 --- a/net/netfilter/nf_conntrack_netlink.c +++ b/net/netfilter/nf_conntrack_netlink.c @@ -1041,16 +1041,13 @@ ctnetlink_parse_nat_setup(struct nf_conn *ct, if (!parse_nat_setup) { #ifdef CONFIG_MODULES rcu_read_unlock(); - spin_unlock_bh(&nf_conntrack_lock); nfnl_unlock(); if (request_module("nf-nat-ipv4") < 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(); if (nfnetlink_parse_nat_setup_hook) return -EAGAIN; |