[PATCH] datalen variable unused in ftp helper.

[Pablo Neira <pablo@eurodev.net>]

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

Hi,

I found that the variable datalen in the ftp helper is sometimes used 
and sometimes not. Attached to this email the patch to fix this.

regards,
Pablo

[-- Attachment #2: ftp_helper-cleanup.patch --]
[-- Type: text/plain, Size: 774 bytes --]

--- linux-2.6.3/net/ipv4/netfilter/ip_conntrack_ftp.c	2004-03-09 18:49:21.000000000 +0100
+++ linux-2.6.3-old/net/ipv4/netfilter/ip_conntrack_ftp.c	2004-02-18 04:59:06.000000000 +0100
@@ -281,7 +281,7 @@
 	datalen = skb->len - dataoff;
 
 	LOCK_BH(&ip_ftp_lock);
-	skb_copy_bits(skb, dataoff, ftp_buffer, datalen);
+	skb_copy_bits(skb, dataoff, ftp_buffer, skb->len - dataoff);
 
 	old_seq_aft_nl_set = ct_ftp_info->seq_aft_nl_set[dir];
 	old_seq_aft_nl = ct_ftp_info->seq_aft_nl[dir];
@@ -317,7 +317,7 @@
 	for (i = 0; i < ARRAY_SIZE(search); i++) {
 		if (search[i].dir != dir) continue;
 
-		found = find_pattern(ftp_buffer, datalen,
+		found = find_pattern(ftp_buffer, skb->len - dataoff,
 				     search[i].pattern,
 				     search[i].plen,
 				     search[i].skip,