/[linux-patches]/genpatches-2.6/trunk/2.6.14/1115_3_ctnetlink-no-icmp-oops.patch
Gentoo

Contents of /genpatches-2.6/trunk/2.6.14/1115_3_ctnetlink-no-icmp-oops.patch

Parent Directory Parent Directory | Revision Log Revision Log


Revision 214 - (show annotations) (download) (as text)
Fri Nov 25 00:35:16 2005 UTC (15 years ago) by dsd
Original Path: genpatches-2.6/trunk/2.6.14/1015_3_ctnetlink-no-icmp-oops.patch
File MIME type: text/x-diff
File size: 1403 byte(s)
Linux 2.6.14.3
1 From laforge@netfilter.org Tue Nov 22 22:59:38 2005
2 Date: Wed, 23 Nov 2005 07:59:21 +0100
3 Message-ID: <20051123065921.GK31478@sunbeam.de.gnumonks.org>
4 From: Harald Welte <laforge@netfilter.org>
5 To: Krzysztof Oledzki <ole@ans.pl>
6 Cc: stable@kernel.org, Pablo Neira Ayuso <pablo@netfilter.org>
7 Subject: [PATCH] [NETFILTER] ctnetlink: Fix oops when no ICMP ID info in message
8
9 From: Krzysztof Piotr Oledzki <ole@ans.pl>
10
11 This patch fixes an userspace triggered oops. If there is no ICMP_ID
12 info the reference to attr will be NULL.
13
14 Signed-off-by: Krzysztof Piotr Oledzki <ole@ans.pl>
15 Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
16 Signed-off-by: Harald Welte <laforge@netfilter.org>
17 Signed-off-by: Chris Wright <chrisw@osdl.org>
18 ---
19
20 net/ipv4/netfilter/ip_conntrack_proto_icmp.c | 3 ++-
21 1 files changed, 2 insertions(+), 1 deletion(-)
22
23 Index: linux-2.6.14.2/net/ipv4/netfilter/ip_conntrack_proto_icmp.c
24 ===================================================================
25 --- linux-2.6.14.2.orig/net/ipv4/netfilter/ip_conntrack_proto_icmp.c
26 +++ linux-2.6.14.2/net/ipv4/netfilter/ip_conntrack_proto_icmp.c
27 @@ -296,7 +296,8 @@ static int icmp_nfattr_to_tuple(struct n
28 struct ip_conntrack_tuple *tuple)
29 {
30 if (!tb[CTA_PROTO_ICMP_TYPE-1]
31 - || !tb[CTA_PROTO_ICMP_CODE-1])
32 + || !tb[CTA_PROTO_ICMP_CODE-1]
33 + || !tb[CTA_PROTO_ICMP_ID-1])
34 return -1;
35
36 tuple->dst.u.icmp.type =

  ViewVC Help
Powered by ViewVC 1.1.20