On Tue, Mar 25, 2008 at 06:40:00PM +0300, Pavel Emelyanov wrote:
> Commit 8b7817f3a959ed99d7443afc12f78a7e1fcc2063 ([IPSEC]: Add ICMP host
> relookup support) introduced some dst leaks on error paths: the rt
> pointer can be forgotten to be put. Fix it bu going to a proper label.
> 
> Found after net namespace's lo refused to unregister :) Many thanks to 
> Den for valuable help during debugging.
> 
> Signed-off-by: Pavel Emelyanov <xemul@openvz.org>
> Signed-off-by: Denis V. Lunev <den@openvz.org>

Thanks for catching this!

> diff --git a/net/ipv4/icmp.c b/net/ipv4/icmp.c
> index ff9a8e6..db231cb 100644
> --- a/net/ipv4/icmp.c
> +++ b/net/ipv4/icmp.c
> @@ -594,11 +594,11 @@ void icmp_send(struct sk_buff *skb_in, int type, int code, __be32 info)
>  			rt = NULL;
>  			break;
>  		default:
> -			goto out_unlock;
> +			goto ende;
>  		}

I'm not sure about this bit though because xfrm_lookup is meant
to free the route on error.

>  		if (xfrm_decode_session_reverse(skb_in, &fl, AF_INET))
> -			goto out_unlock;
> +			goto ende;
>  
>  		if (inet_addr_type(net, fl.fl4_src) == RTN_LOCAL)
>  			err = __ip_route_output_key(net, &rt2, &fl);
> @@ -608,7 +608,7 @@ void icmp_send(struct sk_buff *skb_in, int type, int code, __be32 info)
>  
>  			fl2.fl4_dst = fl.fl4_src;
>  			if (ip_route_output_key(net, &rt2, &fl2))
> -				goto out_unlock;
> +				goto ende;
>  
>  			/* Ugh! */
>  			odst = skb_in->dst;
> @@ -621,7 +621,7 @@ void icmp_send(struct sk_buff *skb_in, int type, int code, __be32 info)
>  		}
>  
>  		if (err)
> -			goto out_unlock;
> +			goto ende;

These ones look good.

Cheers,
-- 
Visit Openswan at http://www.openswan.org/
Email: Herbert Xu ~{PmV>HI~} <herbert@gondor.apana.org.au>
Home Page: http://gondor.apana.org.au/~herbert/
PGP Key: http://gondor.apana.org.au/~herbert/pubkey.txt