[PATCH] Fix return value when proc file creation fails in ip_conntrack

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.

Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

diff --git a/net/ipv4/netfilter/ip_conntrack_standalone.c b/net/ipv4/netfilter/ip_conntrack_standalone.c
index 2055fd40014f2add6d12b69b76b65744a5498ccf..083f0327cf27896b218a2a30598318fc0ace302e 100644 (file)
--- a/net/ipv4/netfilter/ip_conntrack_standalone.c
+++ b/net/ipv4/netfilter/ip_conntrack_standalone.c
@@ -741,6 +741,7 @@ static int init_or_cleanup(int init)
                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;