Patchwork [v3] net/flow: Fix potential memory leak

login
register
mail settings
Submitter huajun li
Date Sept. 28, 2011, 8:51 a.m.
Message ID <CA+v9cxZ=ZYQ_nUXp-8M1Kciia2F6F0MZpq-kKGE4J-ayEGeScw@mail.gmail.com>
Download mbox | patch
Permalink /patch/116722/
State Accepted
Delegated to: David Miller
Headers show

Comments

huajun li - Sept. 28, 2011, 8:51 a.m.
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>
---
 net/core/flow.c |   14 +++++++++++++-
 1 files changed, 13 insertions(+), 1 deletions(-)
David Miller - Oct. 17, 2011, 11:19 p.m.
From: Huajun Li <huajun.li.lee@gmail.com>
Date: Wed, 28 Sep 2011 16:51:39 +0800

> 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>

Applied to net-next, thanks.
--
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Patch

diff --git a/net/core/flow.c b/net/core/flow.c
index 555a456..8ae42de 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)