aboutsummaryrefslogtreecommitdiffstats
path: root/net
diff options
context:
space:
mode:
authorRusty Russell <rusty@rustcorp.com.au>2004-12-14 19:25:10 -0800
committerLinus Torvalds <torvalds@ppc970.osdl.org>2004-12-14 19:25:10 -0800
commit9d53e4dd111c4bcb1f55961fce39823e340016f6 (patch)
tree3969ce2f0bdf6a6334be0a10807a8852a0666c4b /net
parentd6b595259c0991e9119aea73924b554750d60764 (diff)
downloadhistory-9d53e4dd111c4bcb1f55961fce39823e340016f6.tar.gz
[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>
Diffstat (limited to 'net')
-rw-r--r--net/ipv4/netfilter/ip_conntrack_standalone.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/net/ipv4/netfilter/ip_conntrack_standalone.c b/net/ipv4/netfilter/ip_conntrack_standalone.c
index 2055fd40014f2a..083f0327cf2789 100644
--- 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;