netfilter: ctnetlink: fix error return code in init path
authorJulia Lawall <Julia.Lawall@lip6.fr>
Wed, 29 Aug 2012 06:49:16 +0000 (06:49 +0000)
committerPablo Neira Ayuso <pablo@netfilter.org>
Thu, 30 Aug 2012 01:28:22 +0000 (03:28 +0200)
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>
net/netfilter/nf_conntrack_netlink.c

index da4fc37a8578b6ef4590cbd0abf6e04241ebb8fc..9807f3278fcbcdfcc28c61b9b19e6a8c74d02b18 100644 (file)
@@ -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;
        }