From e13cecd7bc847e4a063d1177004e3f62bb6ec935 Mon Sep 17 00:00:00 2001
From: Herbert Xu <herbert@gondor.apana.org.au>
Date: Wed, 2 Apr 2008 00:06:09 -0700
Subject: [PATCH] --- yaml --- r: 88045 b: refs/heads/master c:
 f32c5f2c3866bf4d932d2bc42216dafb90a50ab7 h: refs/heads/master i:   88043:
 b8224a770de71312e8a2bf060fe6cf48de59faed v: v3

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

diff --git a/[refs] b/[refs]
index 90a49d262c99..122195391224 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: a22eb6faae4ec64d59cc206671eb0bfe46c5ffd2
+refs/heads/master: f32c5f2c3866bf4d932d2bc42216dafb90a50ab7
diff --git a/trunk/net/ipv6/icmp.c b/trunk/net/ipv6/icmp.c
index 121d517bf91c..f204a7275a0d 100644
--- a/trunk/net/ipv6/icmp.c
+++ b/trunk/net/ipv6/icmp.c
@@ -436,10 +436,10 @@ void icmpv6_send(struct sk_buff *skb, int type, int code, __u32 info,
 	}
 
 	if (xfrm_decode_session_reverse(skb, &fl2, AF_INET6))
-		goto out;
+		goto out_dst_release;
 
 	if (ip6_dst_lookup(sk, &dst2, &fl))
-		goto out;
+		goto out_dst_release;
 
 	err = xfrm_lookup(&dst2, &fl, sk, XFRM_LOOKUP_ICMP);
 	if (err == -ENOENT) {