diff options
| author | huajun li <huajun.li.lee@gmail.com> | 2011-09-27 22:51:39 +0000 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2011-10-17 19:18:42 -0400 |
| commit | 6ccc3abdc97e07e6895323fdab89f84e58b40ece (patch) | |
| tree | f67e421a3bfe38fe616ad5267acd7c28f3657db9 /net/core | |
| parent | e6f8aa9b90dbb9dbe56e493b91132ced26eaaf81 (diff) | |
| download | linux-stable-6ccc3abdc97e07e6895323fdab89f84e58b40ece.tar.gz linux-stable-6ccc3abdc97e07e6895323fdab89f84e58b40ece.tar.bz2 linux-stable-6ccc3abdc97e07e6895323fdab89f84e58b40ece.zip | |
net/flow: Fix potential memory leak
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>
Diffstat (limited to 'net/core')
| -rw-r--r-- | net/core/flow.c | 14 |
1 files changed, 13 insertions, 1 deletions
diff --git a/net/core/flow.c b/net/core/flow.c index 555a456efb07..8ae42de9c79e 100644 --- a/net/core/flow.c +++ b/net/core/flow.c @@ -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) |