[PATCH 2.6.11 3/4]: Fix ip_conntrack_ftp crash with debugging enabled

[PATCH 2.6.11 3/4]: Fix ip_conntrack_ftp crash with debugging enabled

[Patrick McHardy]

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

data doesn't exist, an integer is printed with %s



[-- Attachment #2: 03.diff --]
[-- Type: text/x-patch, Size: 1262 bytes --]

# This is a BitKeeper generated diff -Nru style patch.
#
# ChangeSet
#   2005/02/01 14:24:23+01:00 nib@cookinglinux.org 
#   [NETFILTER]: Fix ip_conntrack_ftp crash with debugging enabled
#   
#   Signed-off-by: Nicolas Bouliane <nib@cookinglinux.org>
#   Signed-off-by: Patrick McHardy <kaber@trash.net>
# 
# net/ipv4/netfilter/ip_conntrack_ftp.c
#   2005/02/01 14:24:15+01:00 nib@cookinglinux.org +3 -4
#   [NETFILTER]: Fix ip_conntrack_ftp crash with debugging enabled
#   
#   Signed-off-by: Nicolas Bouliane <nib@cookinglinux.org>
#   Signed-off-by: Patrick McHardy <kaber@trash.net>
# 
diff -Nru a/net/ipv4/netfilter/ip_conntrack_ftp.c b/net/ipv4/netfilter/ip_conntrack_ftp.c
--- a/net/ipv4/netfilter/ip_conntrack_ftp.c	2005-02-03 20:43:10 +01:00
+++ b/net/ipv4/netfilter/ip_conntrack_ftp.c	2005-02-03 20:43:10 +01:00
@@ -373,10 +373,9 @@
 		goto out_update_nl;
 	}
 
-	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) {