/[linux-patches]/genpatches-2.6/tags/2.6.15-11/1029_3_dst-release.patch
Gentoo

Contents of /genpatches-2.6/tags/2.6.15-11/1029_3_dst-release.patch

Parent Directory Parent Directory | Revision Log Revision Log


Revision 351 - (show annotations) (download)
Wed Mar 29 11:55:38 2006 UTC (12 years, 6 months ago) by dsd
File size: 1135 byte(s)
2.6.15-11 release
1 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 Signed-off-by: Chris Wright <chrisw@sous-sol.org>
18 ---
19
20 net/ipv4/icmp.c | 2 +-
21 1 files changed, 1 insertion(+), 1 deletion(-)
22
23 Index: linux-2.6.15.2/net/ipv4/icmp.c
24 ===================================================================
25 --- linux-2.6.15.2.orig/net/ipv4/icmp.c
26 +++ linux-2.6.15.2/net/ipv4/icmp.c
27 @@ -524,7 +524,7 @@ void icmp_send(struct sk_buff *skb_in, i
28 iph->tos;
29
30 if (ip_options_echo(&icmp_param.replyopts, skb_in))
31 - goto ende;
32 + goto out_unlock;
33
34
35 /*

  ViewVC Help
Powered by ViewVC 1.1.20