[<prev] [next>] [day] [month] [year] [list]
Message-ID: <20111018060747.GA462@program>
Date: Tue, 18 Oct 2011 14:07:48 +0800
From: wzt <wzt.wzt@...il.com>
To: linux-kernel@...r.kernel.org
Cc: serue@...ibm.com, xemul@...nvz.org, ebiederm@...ssion.com
Subject: [PATCH] kernel/nsproxy.c: Fix memory leak of create_new_namespaces().
copy_pid_ns() has allocted some memory via create_pid_namespace(), if copy_net_ns()
failed via create_new_namespaces(), it will cause memory leak. The copy_utsname()
have the same problem.
Signed-off-by: Zhitong Wang <zhitong.wangzt@...baba-inc.com>
---
kernel/nsproxy.c | 8 ++++++--
1 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/kernel/nsproxy.c b/kernel/nsproxy.c
index 9aeab4b..fdcec31 100644
--- a/kernel/nsproxy.c
+++ b/kernel/nsproxy.c
@@ -99,14 +99,18 @@ static struct nsproxy *create_new_namespaces(unsigned long flags,
return new_nsp;
out_net:
- if (new_nsp->pid_ns)
+ if (new_nsp->pid_ns) {
put_pid_ns(new_nsp->pid_ns);
+ free_pid_ns(&new_nsp->pid_ns->kref);
+ }
out_pid:
if (new_nsp->ipc_ns)
put_ipc_ns(new_nsp->ipc_ns);
out_ipc:
- if (new_nsp->uts_ns)
+ if (new_nsp->uts_ns) {
put_uts_ns(new_nsp->uts_ns);
+ free_uts_ns(&new_nsp->pid_ns->kref);
+ }
out_uts:
if (new_nsp->mnt_ns)
put_mnt_ns(new_nsp->mnt_ns);
--
1.7.4.1
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists