summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorUlrich Weber <ulrich.weber@sophos.com>2012-09-20 03:52:04 (GMT)
committerPablo Neira Ayuso <pablo@netfilter.org>2012-09-21 10:09:25 (GMT)
commit136251d02ff283e99f023b0abdeb52b4b3423a56 (patch)
tree8b65071a9510f6bfe69f6e35e379f6c04a42203f
parentb0cdb1d9a9522b4f0905f11e4c7d7a59e0f7dc44 (diff)
downloadlinux-136251d02ff283e99f023b0abdeb52b4b3423a56.tar.xz
netfilter: nf_nat: remove obsolete rcu_read_unlock call
hlist walk in find_appropriate_src() is not protected anymore by rcu_read_lock(), so rcu_read_unlock() is unnecessary if in_range() matches. This bug was added in (c7232c9 netfilter: add protocol independent NAT core). Signed-off-by: Ulrich Weber <ulrich.weber@sophos.com> Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
-rw-r--r--net/netfilter/nf_nat_core.c4
1 files changed, 1 insertions, 3 deletions
diff --git a/net/netfilter/nf_nat_core.c b/net/netfilter/nf_nat_core.c
index 65cf694..5f2f910 100644
--- a/net/netfilter/nf_nat_core.c
+++ b/net/netfilter/nf_nat_core.c
@@ -201,10 +201,8 @@ find_appropriate_src(struct net *net, u16 zone,
&ct->tuplehash[IP_CT_DIR_REPLY].tuple);
result->dst = tuple->dst;
- if (in_range(l3proto, l4proto, result, range)) {
- rcu_read_unlock();
+ if (in_range(l3proto, l4proto, result, range))
return 1;
- }
}
}
return 0;