[PATCH] Another ip_conntrack seq fix: ip_conntrack_expect

Rusty Russell (IBM) rusty at au1.ibm.com
Tue Sep 21 00:26:31 CEST 2004


Name: Fix /proc/net/ip_conntrack_expect output
Status: Tested under nfsum on 2.6.9-rc1-bk16
Signed-off-by: Rusty Russell <rusty at rustcorp.com.au>
Depends: Netfilter/conntrack-seq-fix.patch.gz

/proc/net/ip_conntrack_expect was changed over to seq_file, but a \n
is missing.

diff -urpN --exclude TAGS -X /home/rusty/devel/kernel/kernel-patches/current-dontdiff --minimal .19747-linux-2.6.9-rc2-bk4/net/ipv4/netfilter/ip_conntrack_standalone.c .19747-linux-2.6.9-rc2-bk4.updated/net/ipv4/netfilter/ip_conntrack_standalone.c
--- .19747-linux-2.6.9-rc2-bk4/net/ipv4/netfilter/ip_conntrack_standalone.c	2004-09-16 00:17:16.000000000 +1000
+++ .19747-linux-2.6.9-rc2-bk4.updated/net/ipv4/netfilter/ip_conntrack_standalone.c	2004-09-20 06:03:50.000000000 +1000
@@ -241,8 +241,9 @@ static int exp_seq_show(struct seq_file 
 	seq_printf(s, "use=%u proto=%u ", atomic_read(&expect->use),
 		   expect->tuple.dst.protonum);
 
-	return print_tuple(s, &expect->tuple,
-			   __ip_ct_find_proto(expect->tuple.dst.protonum));
+	print_tuple(s, &expect->tuple,
+		    __ip_ct_find_proto(expect->tuple.dst.protonum));
+	return seq_putc(s, '\n');
 }
 
 static struct seq_operations exp_seq_ops = {





More information about the netfilter-devel mailing list