summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJulia Lawall <Julia.Lawall@lip6.fr>2012-08-29 06:49:16 +0000
committerPablo Neira Ayuso <pablo@netfilter.org>2012-08-30 03:28:22 +0200
commitef6acf68c259d907517dcc0ffefcd4e30276ae29 (patch)
tree0742883dc0de77d7b49fa0fb866206519f362e14
parent0a54e939d8c2647c711ef2369c3e73c3b7f3028c (diff)
downloadop-kernel-dev-ef6acf68c259d907517dcc0ffefcd4e30276ae29.zip
op-kernel-dev-ef6acf68c259d907517dcc0ffefcd4e30276ae29.tar.gz
netfilter: ctnetlink: fix error return code in init path
Initialize return variable before exiting on an error path. A simplified version of the semantic match that finds this problem is as follows: (http://coccinelle.lip6.fr/) // <smpl> ( if@p1 (\(ret < 0\|ret != 0\)) { ... return ret; } | ret@p1 = 0 ) ... when != ret = e1 when != &ret *if(...) { ... when != ret = e2 when forall return ret; } // </smpl> Signed-off-by: Julia Lawall <Julia.Lawall@lip6.fr> Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
-rw-r--r--net/netfilter/nf_conntrack_netlink.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/net/netfilter/nf_conntrack_netlink.c b/net/netfilter/nf_conntrack_netlink.c
index da4fc37..9807f32 100644
--- a/net/netfilter/nf_conntrack_netlink.c
+++ b/net/netfilter/nf_conntrack_netlink.c
@@ -2790,7 +2790,8 @@ static int __init ctnetlink_init(void)
goto err_unreg_subsys;
}
- if (register_pernet_subsys(&ctnetlink_net_ops)) {
+ ret = register_pernet_subsys(&ctnetlink_net_ops);
+ if (ret < 0) {
pr_err("ctnetlink_init: cannot register pernet operations\n");
goto err_unreg_exp_subsys;
}
OpenPOWER on IntegriCloud