summary refs log tree commit diff
path: root/ipc/sem.c
diff options
context:
space:
mode:
authorSerge E. Hallyn <serue@us.ibm.com>2009-12-15 16:47:27 -0800
committerLinus Torvalds <torvalds@linux-foundation.org>2009-12-16 07:20:09 -0800
commit7d6feeb287c61aafa88f06345387b1188edf4b86 (patch)
treeb07d1033d8980256d596686d75c2207b1f2cce0a /ipc/sem.c
parent1be53963b0519bd3681749a9bed8b83aeb005cca (diff)
downloadlinux-7d6feeb287c61aafa88f06345387b1188edf4b86.tar.gz
ipc ns: fix memory leak (idr)
We have apparently had a memory leak since
7ca7e564e049d8b350ec9d958ff25eaa24226352 "ipc: store ipcs into IDRs" in
2007.  The idr of which 3 exist for each ipc namespace is never freed.

This patch simply frees them when the ipcns is freed.  I don't believe any
idr_remove() are done from rcu (and could therefore be delayed until after
this idr_destroy()), so the patch should be safe.  Some quick testing
showed no harm, and the memory leak fixed.

Caught by kmemleak.

Signed-off-by: Serge E. Hallyn <serue@us.ibm.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'ipc/sem.c')
-rw-r--r--ipc/sem.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/ipc/sem.c b/ipc/sem.c
index 87c2b641fd7b..2f2a47959576 100644
--- a/ipc/sem.c
+++ b/ipc/sem.c
@@ -129,6 +129,7 @@ void sem_init_ns(struct ipc_namespace *ns)
 void sem_exit_ns(struct ipc_namespace *ns)
 {
 	free_ipcs(ns, &sem_ids(ns), freeary);
+	idr_destroy(&ns->ids[IPC_SEM_IDS].ipcs_idr);
 }
 #endif