net/flow: Fix potential memory leak
authorhuajun li <huajun.li.lee@gmail.com>
Tue, 27 Sep 2011 22:51:39 +0000 (22:51 +0000)
committerDavid S. Miller <davem@davemloft.net>
Mon, 17 Oct 2011 23:18:42 +0000 (19:18 -0400)
While preparing net flow caches, once a fail may cause potential
memory leak , fix it.

Signed-off-by: Huajun Li <huajun.li.lee@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
net/core/flow.c

index 555a456efb076d016abe58827b93d05ab39a7465..8ae42de9c79e78379691f20207987c5b2ea338b6 100644 (file)
@@ -413,7 +413,7 @@ static int __init flow_cache_init(struct flow_cache *fc)
 
        for_each_online_cpu(i) {
                if (flow_cache_cpu_prepare(fc, i))
-                       return -ENOMEM;
+                       goto err;
        }
        fc->hotcpu_notifier = (struct notifier_block){
                .notifier_call = flow_cache_cpu,
@@ -426,6 +426,18 @@ static int __init flow_cache_init(struct flow_cache *fc)
        add_timer(&fc->rnd_timer);
 
        return 0;
+
+err:
+       for_each_possible_cpu(i) {
+               struct flow_cache_percpu *fcp = per_cpu_ptr(fc->percpu, i);
+               kfree(fcp->hash_table);
+               fcp->hash_table = NULL;
+       }
+
+       free_percpu(fc->percpu);
+       fc->percpu = NULL;
+
+       return -ENOMEM;
 }
 
 static int __init flow_cache_init_global(void)