From: Herbert Xu <herbert@gondor.apana.org.au>
Date: Sat, 4 Feb 2006 10:09:34 +0000 (-0800)
Subject: [ICMP]: Fix extra dst release when ip_options_echo fails
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=fa60cf7f64a00c16e95717e8dccdb128877e342a;p=GitHub%2Fmoto-9609%2Fandroid_kernel_motorola_exynos9610.git

[ICMP]: 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>
---

diff --git a/net/ipv4/icmp.c b/net/ipv4/icmp.c
index 6bc0887b0834..4d1c40972a4b 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;
 
 
 	/*