/[linux-patches]/genpatches-2.6/trunk/2.6.14/1114_3_ctnetlink-protoinfo.patch
Gentoo

Contents of /genpatches-2.6/trunk/2.6.14/1114_3_ctnetlink-protoinfo.patch

Parent Directory Parent Directory | Revision Log Revision Log


Revision 292 - (hide annotations) (download) (as text)
Tue Jan 31 21:50:53 2006 UTC (14 years, 10 months ago) by johnm
File MIME type: text/x-diff
File size: 1286 byte(s)
Large update - thanks goes to Kerin Millar for the legwork.
1 dsd 214 From stable-bounces@linux.kernel.org Tue Nov 15 04:33:16 2005
2     Date: Tue, 15 Nov 2005 13:32:36 +0100
3     From: Harald Welte <laforge@netfilter.org>
4     To: Stable Kernel <stable@kernel.org>
5     Cc:
6     Subject: [PATCH] [NETFILTER] ctnetlink: check if protoinfo is present
7    
8     This fixes an oops triggered from userspace. If we don't pass information
9     about the private protocol info, the reference to attr will be NULL. This is
10     likely to happen in update messages.
11    
12     Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
13     Signed-off-by: Harald Welte <laforge@netfilter.org>
14     Signed-off-by: Chris Wright <chrisw@osdl.org>
15     Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
16     ---
17     net/ipv4/netfilter/ip_conntrack_proto_tcp.c | 5 +++++
18     1 file changed, 5 insertions(+)
19    
20     --- linux-2.6.14.2.orig/net/ipv4/netfilter/ip_conntrack_proto_tcp.c
21     +++ linux-2.6.14.2/net/ipv4/netfilter/ip_conntrack_proto_tcp.c
22     @@ -362,6 +362,11 @@ static int nfattr_to_tcp(struct nfattr *
23     struct nfattr *attr = cda[CTA_PROTOINFO_TCP-1];
24     struct nfattr *tb[CTA_PROTOINFO_TCP_MAX];
25    
26     + /* updates could not contain anything about the private
27     + * protocol info, in that case skip the parsing */
28     + if (!attr)
29     + return 0;
30     +
31     if (nfattr_parse_nested(tb, CTA_PROTOINFO_TCP_MAX, attr) < 0)
32     goto nfattr_failure;
33    

  ViewVC Help
Powered by ViewVC 1.1.20