Home » Mailing list archives » linux-netdev » 2008 » March » 26

[PATCH][ICMP]: Dst entry leak in icmp_send host re-lookup code (v2).

!MAILaRCHIVE_VOTE_RePLACE
Previous message: [thread] [date] [author]
Next message: [thread] [date] [author]
[view in full thread]
From: Pavel Emelyanov <xemul@...>
To: David Miller <davem@...>
Cc: Herbert Xu <herbert@...>, Denis Lunev <den@...>, Linux Netdev List <netdev@...>, <devel@...>
Subject: [PATCH][ICMP]: Dst entry leak in icmp_send host re-lookup code (v2).
Date: Wednesday, March 26, 2008 - 5:25 am

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.

Herbert pointed out, that xfrm_lookup() will put the rtable in case
of error itself, so the first goto fix is redundant.

Signed-off-by: Pavel Emelyanov <xemul@openvz.org>
Signed-off-by: Denis V. Lunev <den@openvz.org>

---

diff --git a/net/ipv4/icmp.c b/net/ipv4/icmp.c
index a13c074..a944e80 100644
--- a/net/ipv4/icmp.c
+++ b/net/ipv4/icmp.c
@@ -591,7 +591,7 @@ void icmp_send(struct sk_buff *skb_in, int type, int code, __be32 info)
 		}
 
 		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);
@@ -601,7 +601,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;
@@ -614,7 +614,7 @@ void icmp_send(struct sk_buff *skb_in, int type, int code, __be32 info)
 		}
 
 		if (err)
-			goto out_unlock;
+			goto ende;
 
 		err = xfrm_lookup((struct dst_entry **)&rt2, &fl, NULL,
 				  XFRM_LOOKUP_ICMP);
--
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Previous message: [thread] [date] [author]
Next message: [thread] [date] [author]
Messages in current thread:
[PATCH][ICMP]: Dst entry leak in icmp_send host re-lookup co..., Pavel Emelyanov, (Wed Mar 26, 5:25 am)
Re: [PATCH][ICMP]: Dst entry leak in icmp_send host re-looku..., Herbert Xu, (Tue Apr 1, 8:15 am)
Re: [PATCH][ICMP]: Dst entry leak in icmp_send host re-looku..., Julian Anastasov, (Wed Apr 2, 5:19 am)
Re: [PATCH][ICMP]: Dst entry leak in icmp_send host re-looku..., Herbert Xu, (Wed Apr 2, 8:40 am)
Re: [PATCH][ICMP]: Dst entry leak in icmp_send host re-looku..., David Miller, (Thu Apr 3, 4:00 pm)
Re: [PATCH][ICMP]: Dst entry leak in icmp_send host re-looku..., Julian Anastasov, (Wed Apr 2, 7:29 pm)
Re: [PATCH][ICMP]: Dst entry leak in icmp_send host re-looku..., David Miller, (Wed Apr 2, 3:06 am)
Re: [PATCH][ICMP]: Dst entry leak in icmp_send host re-looku..., David Miller, (Wed Mar 26, 5:27 am)