| From 603f7aae63969465bc731a7c4670aa782df7a6ca Mon Sep 17 00:00:00 2001 |
| From: Cong Wang <amwang@redhat.com> |
| Date: Thu, 9 May 2013 22:40:00 +0000 |
| Subject: xfrm6: release dev before returning error |
| |
| |
| From: Cong Wang <amwang@redhat.com> |
| |
| [ Upstream commit 84c4a9dfbf430861e7588d95ae3ff61535dca351 ] |
| |
| We forget to call dev_put() on error path in xfrm6_fill_dst(), |
| its caller doesn't handle this. |
| |
| Signed-off-by: Cong Wang <amwang@redhat.com> |
| 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: David S. Miller <davem@davemloft.net> |
| Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> |
| --- |
| net/ipv6/xfrm6_policy.c | 4 +++- |
| 1 file changed, 3 insertions(+), 1 deletion(-) |
| |
| --- a/net/ipv6/xfrm6_policy.c |
| +++ b/net/ipv6/xfrm6_policy.c |
| @@ -103,8 +103,10 @@ static int xfrm6_fill_dst(struct xfrm_ds |
| 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; |
| + } |
| |
| rt6_transfer_peer(&xdst->u.rt6, rt); |
| |