diff options
| author | Li RongQing <roy.qing.li@gmail.com> | 2012-09-17 22:40:10 +0000 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2012-10-13 05:28:04 +0900 |
| commit | 72ab84bd1945bb593047564680ea919b8e13beeb (patch) | |
| tree | 4bb0b8b0a63c4ca9254591838a559799b2df9669 /net/xfrm | |
| parent | 182d22d51bc2f57cded9eed61dbbcfb82b87da1c (diff) | |
| download | kernel_samsung_smdk4412-72ab84bd1945bb593047564680ea919b8e13beeb.zip kernel_samsung_smdk4412-72ab84bd1945bb593047564680ea919b8e13beeb.tar.gz kernel_samsung_smdk4412-72ab84bd1945bb593047564680ea919b8e13beeb.tar.bz2 | |
xfrm: fix a read lock imbalance in make_blackhole
[ Upstream commit 433a19548061bb5457b6ab77ed7ea58ca6e43ddb ]
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>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'net/xfrm')
| -rw-r--r-- | net/xfrm/xfrm_policy.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/xfrm/xfrm_policy.c b/net/xfrm/xfrm_policy.c index 0c0e40e..7c8e0cb 100644 --- a/net/xfrm/xfrm_policy.c +++ b/net/xfrm/xfrm_policy.c @@ -1759,7 +1759,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); } |