Re: [PATCH] ip_conntrack_ftp segfault

[Nicolas Bouliane <nib@cookinglinux.org>]

[-- Attachment #1: Type: text/plain, Size: 470 bytes --]

Pablo Neira wrote:
> nice catch, but read the comments below.

> Since this is a minor fix, try to modify as less things as you can. data 
> doesn't exist but look for its natural replacement which is fb_ptr.

Hey Pablo, thanks for the hints! :)

>> This patch fix two bugs (when DEBUGP is defined):
>> o The var `data` doesn't exist, hence gcc complains.
>> o It segfault because we print an integer with `%s`.

Signed-off-by: Nicolas Bouliane <nib@cookinglinux.org>



[-- Attachment #2: ip_conntrack_ftp.c.patch --]
[-- Type: text/x-patch, Size: 613 bytes --]

--- linux-2.6.10/net/ipv4/netfilter/ip_conntrack_ftp.c	2004-12-24 16:35:59.000000000 -0500
+++ linux-2.6.10NIB/net/ipv4/netfilter/ip_conntrack_ftp.c	2005-01-04 13:24:35.000000000 -0500
@@ -347,10 +347,9 @@
 		goto out;
 	}
 
-	DEBUGP("conntrack_ftp: match `%.*s' (%u bytes at %u)\n",
-	       (int)matchlen, data + matchoff,
-	       matchlen, ntohl(th->seq) + matchoff);
-
+	DEBUGP("conntrack_ftp: match `%s' (%u bytes at %u)\n",
+	       fb_ptr + matchoff, matchlen, ntohl(th->seq) + matchoff);
+			 
 	/* Allocate expectation which will be inserted */
 	exp = ip_conntrack_expect_alloc();
 	if (exp == NULL) {