summaryrefslogtreecommitdiff
path: root/net
diff options
context:
space:
mode:
authorLi RongQing <roy.qing.li@gmail.com>2012-09-17 22:40:10 +0000
committerDavid S. Miller <davem@davemloft.net>2012-09-18 16:30:15 -0400
commit433a19548061bb5457b6ab77ed7ea58ca6e43ddb (patch)
tree97d4a0f66372f2c24b00dcc970f033d6dfd08f6c /net
parent1d57f19539c074105791da6384a8ad674bba8037 (diff)
downloadlinux-3.10-433a19548061bb5457b6ab77ed7ea58ca6e43ddb.tar.gz
linux-3.10-433a19548061bb5457b6ab77ed7ea58ca6e43ddb.tar.bz2
linux-3.10-433a19548061bb5457b6ab77ed7ea58ca6e43ddb.zip
xfrm: fix a read lock imbalance in make_blackhole
if xfrm_policy_get_afinfo returns 0, it has already released the read lock, xfrm_policy_put_afinfo should not be called again. Signed-off-by: Li RongQing <roy.qing.li@gmail.com> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net')
-rw-r--r--net/xfrm/xfrm_policy.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/net/xfrm/xfrm_policy.c b/net/xfrm/xfrm_policy.c
index ab2ce7d5152..387848e9007 100644
--- a/net/xfrm/xfrm_policy.c
+++ b/net/xfrm/xfrm_policy.c
@@ -1764,7 +1764,7 @@ static struct dst_entry *make_blackhole(struct net *net, u16 family,
if (!afinfo) {
dst_release(dst_orig);
- ret = ERR_PTR(-EINVAL);
+ return ERR_PTR(-EINVAL);
} else {
ret = afinfo->blackhole_route(net, dst_orig);
}