[PATCH 2/2] net: Fix potential memory leak
flat view
STALE5501d
From: Huajun Li <hidden>
Date: 2011-09-24 15:57:15
Subsystem:
networking [general], the rest · Maintainers:
"David S. Miller", Eric Dumazet, Jakub Kicinski, Paolo Abeni, Linus Torvalds
While preparing flow caches, once fail may cause potential memory leak , fix it. Signed-off-by: Huajun Li <redacted> --- net/core/flow.c | 19 ++++++++++++++++++- 1 files changed, 18 insertions(+), 1 deletions(-)
diff --git a/net/core/flow.c b/net/core/flow.c
index ba3e617..2dcaa03 100644
--- a/net/core/flow.c
+++ b/net/core/flow.c@@ -420,7 +420,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,
@@ -433,6 +433,23 @@ static int __init flow_cache_init(struct flow_cache *fc) add_timer(&fc->rnd_timer); return 0; +err: + if (fc->percpu) { + free_percpu(fc->percpu); + fc->percpu = NULL; + } + + /* + * Check each possible CPUs rather than online ones because they may be + * offline before the notifier is registered. + */ + for_each_possible_cpu(i) { + struct flow_cache_percpu *fcp = per_cpu_ptr(fc->percpu, i); + kfree(fcp->hash_table); + fcp->hash_table = NULL; + } + + return -ENOMEM; } static int __init flow_cache_init_global(void)
--
1.7.4.1