summaryrefslogtreecommitdiffstats
path: root/net
diff options
context:
space:
mode:
authorHerbert Xu <herbert@gondor.apana.org.au>2006-02-04 02:09:34 -0800
committerDavid S. Miller <davem@sunset.davemloft.net>2006-02-04 23:51:14 -0800
commitfa60cf7f64a00c16e95717e8dccdb128877e342a (patch)
treeec8ca75f79971c6bd2b3754b6207a4adce51e37c /net
parent5b7b644ca9a12396a46fad825a973fb8bed17102 (diff)
downloadlinux-fa60cf7f64a00c16e95717e8dccdb128877e342a.tar.gz
linux-fa60cf7f64a00c16e95717e8dccdb128877e342a.tar.bz2
linux-fa60cf7f64a00c16e95717e8dccdb128877e342a.zip
[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>
Diffstat (limited to 'net')
-rw-r--r--net/ipv4/icmp.c2
1 files changed, 1 insertions, 1 deletions
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;
/*