aboutsummaryrefslogtreecommitdiffstats
path: root/net/ipv6/xfrm6_policy.c
diff options
context:
space:
mode:
authorCong Wang <amwang@redhat.com>2013-05-09 22:40:00 +0000
committerBen Hutchings <ben@decadent.org.uk>2013-05-30 14:35:14 +0100
commit01b0d887f67a388fb2a658ee2bdd74e5ba146818 (patch)
tree236f63de0462026fafdfa0f1b8865ec005bc46f1 /net/ipv6/xfrm6_policy.c
parent6b0c985d7eedd52ddba6968d46bbc12ad603a577 (diff)
downloadkernel_samsung_smdk4412-01b0d887f67a388fb2a658ee2bdd74e5ba146818.zip
kernel_samsung_smdk4412-01b0d887f67a388fb2a658ee2bdd74e5ba146818.tar.gz
kernel_samsung_smdk4412-01b0d887f67a388fb2a658ee2bdd74e5ba146818.tar.bz2
xfrm6: release dev before returning error
[ Upstream commit 84c4a9dfbf430861e7588d95ae3ff61535dca351 ] We forget to call dev_put() on error path in xfrm6_fill_dst(), its caller doesn't handle this. Cc: Herbert Xu <herbert@gondor.apana.org.au> Cc: Steffen Klassert <steffen.klassert@secunet.com> Cc: David S. Miller <davem@davemloft.net> Signed-off-by: Cong Wang <amwang@redhat.com> Signed-off-by: David S. Miller <davem@davemloft.net> Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
Diffstat (limited to 'net/ipv6/xfrm6_policy.c')
-rw-r--r--net/ipv6/xfrm6_policy.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/net/ipv6/xfrm6_policy.c b/net/ipv6/xfrm6_policy.c
index d879f7e..db78e7d 100644
--- a/net/ipv6/xfrm6_policy.c
+++ b/net/ipv6/xfrm6_policy.c
@@ -96,8 +96,10 @@ static int xfrm6_fill_dst(struct xfrm_dst *xdst, struct net_device *dev,
dev_hold(dev);
xdst->u.rt6.rt6i_idev = in6_dev_get(dev);
- if (!xdst->u.rt6.rt6i_idev)
+ if (!xdst->u.rt6.rt6i_idev) {
+ dev_put(dev);
return -ENODEV;
+ }
xdst->u.rt6.rt6i_peer = rt->rt6i_peer;
if (rt->rt6i_peer)