/[linux-patches]/genpatches-2.6/trunk/2.6.14/1415_15.3_dst-release.patch
Gentoo

Contents of /genpatches-2.6/trunk/2.6.14/1415_15.3_dst-release.patch

Parent Directory Parent Directory | Revision Log Revision Log


Revision 328 - (hide annotations) (download) (as text)
Tue Mar 14 13:34:17 2006 UTC (14 years, 8 months ago) by johnm
File MIME type: text/x-diff
File size: 1081 byte(s)
2.6.14-11, rebase against local tree
1 johnm 328 From stable-bounces@linux.kernel.org Sat Feb 4 02:36:34 2006
2     Date: Sat, 04 Feb 2006 02:29:45 -0800 (PST)
3     From: "David S. Miller" <davem@davemloft.net>
4     To: stable@kernel.org
5     Cc:
6     Subject: [ICMP]: Fix extra dst release when ip_options_echo fails
7    
8     From: Herbert Xu <herbert@gondor.apana.org.au>
9    
10     When two ip_route_output_key lookups in icmp_send were combined I
11     forgot to change the error path for ip_options_echo to not drop the
12     dst reference since it now sits before the dst lookup. To fix it we
13     simply jump past the ip_rt_put call.
14    
15     Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
16     Signed-off-by: David S. Miller <davem@davemloft.net>
17    
18     net/ipv4/icmp.c | 2 +-
19     1 files changed, 1 insertion(+), 1 deletion(-)
20    
21     Index: linux-2.6.15.2/net/ipv4/icmp.c
22     ===================================================================
23     --- linux-2.6.15.2.orig/net/ipv4/icmp.c
24     +++ linux-2.6.15.2/net/ipv4/icmp.c
25     @@ -524,7 +524,7 @@ void icmp_send(struct sk_buff *skb_in, i
26     iph->tos;
27    
28     if (ip_options_echo(&icmp_param.replyopts, skb_in))
29     - goto ende;
30     + goto out_unlock;
31    
32    
33     /*

  ViewVC Help
Powered by ViewVC 1.1.20