From 493fc8f9f0dff7a1f03a41f0ab0227bba78d2594 Mon Sep 17 00:00:00 2001 From: Pavel Emelyanov Date: Wed, 26 Mar 2008 02:27:09 -0700 Subject: [PATCH] --- yaml --- r: 87840 b: refs/heads/master c: 7c0ecc4c4f8fd90988aab8a95297b9c0038b6160 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/net/ipv4/icmp.c | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index 18c0a13febd8..0fd18db8095e 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 5c2e2e239ebe44e3fdc5f2ae270d96c4ceee4e9a +refs/heads/master: 7c0ecc4c4f8fd90988aab8a95297b9c0038b6160 diff --git a/trunk/net/ipv4/icmp.c b/trunk/net/ipv4/icmp.c index a13c074dac09..a944e8053e28 100644 --- a/trunk/net/ipv4/icmp.c +++ b/trunk/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);