]> err.no Git - linux-2.6/commitdiff
[ICMP]: Fix extra dst release when ip_options_echo fails
authorHerbert Xu <herbert@gondor.apana.org.au>
Sat, 4 Feb 2006 10:09:34 +0000 (02:09 -0800)
committerDavid S. Miller <davem@sunset.davemloft.net>
Sun, 5 Feb 2006 07:51:14 +0000 (23:51 -0800)
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>
net/ipv4/icmp.c

index 6bc0887b0834ff9ee85dbe21e3aaf940b76f6fa1..4d1c40972a4bcb7b2d32e08b0c21fa79eb69c02c 100644 (file)
@@ -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;
 
 
        /*