Re: [PATCH v2] net/flow: Fix potential memory leak
flat view
From: Eric Dumazet <hidden>
Date: 2011-09-27 12:11:18
Le mardi 27 septembre 2011 à 18:34 +0800, Huajun Li a écrit :
While preparing net flow caches, once fail may cause potential memory leak , fix it. Acked-by: Eric Dumazet <redacted>
Hmm, please dont add "Acked-by" yourself, when submitting a new patch version. Let us review the new version and ACK it eventually.
quoted hunk ↗ jump to hunk
Signed-off-by: Huajun Li <redacted> --- net/core/flow.c | 16 +++++++++++++++- 1 files changed, 15 insertions(+), 1 deletions(-)diff --git a/net/core/flow.c b/net/core/flow.c index 555a456..4e60fce 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,20 @@ 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; + } + + if (fc->percpu) {
test not needed here, fc->percpu is not NULL
quoted hunk ↗ jump to hunk
+ free_percpu(fc->percpu); + fc->percpu = NULL; + } + + return -ENOMEM; } static int __init flow_cache_init_global(void)