From 69e3921c6a9264bef228a65a113ac175d683bde0 Mon Sep 17 00:00:00 2001
From: Cong Wang <amwang@redhat.com>
Date: Thu, 9 May 2013 22:40:00 +0000
Subject: [PATCH] --- yaml --- r: 375539 b: refs/heads/master c:
 84c4a9dfbf430861e7588d95ae3ff61535dca351 h: refs/heads/master i:   375537:
 fb2650f6b473697d78fce14ae531632d85775527   375535:
 c7b66fb739fa25e419eb146d38748bf0fb2ac28c v: v3

---
 [refs]                        | 2 +-
 trunk/net/ipv6/xfrm6_policy.c | 4 +++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 4d78f7e8704d..75d71ca7ab4d 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 5dbd5068430b8bd1c19387d46d6c1a88b261257f
+refs/heads/master: 84c4a9dfbf430861e7588d95ae3ff61535dca351
diff --git a/trunk/net/ipv6/xfrm6_policy.c b/trunk/net/ipv6/xfrm6_policy.c
index 4ef7bdb65440..23ed03d786c8 100644
--- a/trunk/net/ipv6/xfrm6_policy.c
+++ b/trunk/net/ipv6/xfrm6_policy.c
@@ -103,8 +103,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;
+	}
 
 	rt6_transfer_peer(&xdst->u.rt6, rt);