]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
ipvs: fix error return code
authorJulia Lawall <Julia.Lawall@lip6.fr>
Wed, 29 Aug 2012 06:49:11 +0000 (06:49 +0000)
committerPablo Neira Ayuso <pablo@netfilter.org>
Thu, 30 Aug 2012 01:27:19 +0000 (03:27 +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>
Acked-by: Simon Horman <horms@verge.net.au>
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
net/netfilter/ipvs/ip_vs_ctl.c

index 72bf32a84874718927a4bcbdc2e26395be00bdd8..f51013c07b9f4e5a81885f0462d5423ccbc8a44f 100644 (file)
@@ -1171,8 +1171,10 @@ ip_vs_add_service(struct net *net, struct ip_vs_service_user_kern *u,
                goto out_err;
        }
        svc->stats.cpustats = alloc_percpu(struct ip_vs_cpu_stats);
-       if (!svc->stats.cpustats)
+       if (!svc->stats.cpustats) {
+               ret = -ENOMEM;
                goto out_err;
+       }
 
        /* I'm the first user of the service */
        atomic_set(&svc->usecnt, 0);