From: Herbert Xu <herbert@gondor.apana.org.au>
Date: Sat, 4 Feb 2006 10:29:45 +0000 (-0800)
Subject: [PATCH] Fix extra dst release when ip_options_echo fails
X-Git-Tag: v2.6.15.3~1
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=6be20a3ccd442701bc271a5ffca3e0084188831b;p=thirdparty%2Fkernel%2Fstable.git

[PATCH] Fix extra dst release when ip_options_echo fails

When two ip_route_output_key lookups in icmp_send were combined I
forgot to change the error path for ip_options_echo to not drop the
dst reference since it now sits before the dst lookup.  To fix it we
simply jump past the ip_rt_put call.

Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
Signed-off-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Chris Wright <chrisw@sous-sol.org>
---

diff --git a/net/ipv4/icmp.c b/net/ipv4/icmp.c
index 92e23b2ad4d21..84de934dd1ed9 100644
--- a/net/ipv4/icmp.c
+++ b/net/ipv4/icmp.c
@@ -524,7 +524,7 @@ void icmp_send(struct sk_buff *skb_in, int type, int code, u32 info)
 					  iph->tos;
 
 	if (ip_options_echo(&icmp_param.replyopts, skb_in))
-		goto ende;
+		goto out_unlock;
 
 
 	/*