From: Rusty Russell <rusty@rustcorp.com.au>
Subject: [PATCH] Fix return value when proc file creation fails in
	ip_conntrack
Date: Wed, 15 Dec 2004 15:00:32 +1100
Message-ID: <1103083233.4696.0.camel@localhost.localdomain>
Mime-Version: 1.0
Content-Type: text/plain
Content-Transfer-Encoding: 7bit
Cc: Netfilter development mailing list <netfilter-devel@lists.netfilter.org>
Return-path: <netfilter-devel-bounces@lists.netfilter.org>
To: Linus Torvalds <torvalds@osdl.org>
List-Unsubscribe: <https://lists.netfilter.org/mailman/listinfo/netfilter-devel>,
	<mailto:netfilter-devel-request@lists.netfilter.org?subject=unsubscribe>
List-Archive: </pipermail/netfilter-devel>
List-Post: <mailto:netfilter-devel@lists.netfilter.org>
List-Help: <mailto:netfilter-devel-request@lists.netfilter.org?subject=help>
List-Subscribe: <https://lists.netfilter.org/mailman/listinfo/netfilter-devel>,
	<mailto:netfilter-devel-request@lists.netfilter.org?subject=subscribe>
Sender: netfilter-devel-bounces@lists.netfilter.org
Errors-To: netfilter-devel-bounces@lists.netfilter.org
List-Id: netfilter-devel.vger.kernel.org

Name: Fix return value when proc file creation fails in ip_conntrack
Status: Tested
Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>

We notiecd proc_net_fops_create() failing, and cleaned up, but
returned 0 anyway.

Found by the --failtest flag to nfsim-testsuite.  --failtest rocks my
world.

Index:
linux-2.6.10-rc3-bk6-Netfilter/net/ipv4/netfilter/ip_conntrack_standalone.c
===================================================================
---
linux-2.6.10-rc3-bk6-Netfilter.orig/net/ipv4/netfilter/ip_conntrack_standalone.c	2004-12-15 14:37:23.464334568 +1100
+++
linux-2.6.10-rc3-bk6-Netfilter/net/ipv4/netfilter/ip_conntrack_standalone.c	2004-12-15 14:38:12.893820144 +1100
@@ -741,6 +741,7 @@
 		goto cleanup_nothing;
 
 #ifdef CONFIG_PROC_FS
+	ret = -ENOMEM;
 	proc = proc_net_fops_create("ip_conntrack", 0440, &ct_file_ops);
 	if (!proc) goto cleanup_init;
 

-- 
A bad analogy is like a leaky screwdriver -- Richard Braakman