ipc ns: fix memory leak (idr)

PATCH New Serge E. Hallyn 1 participant 1 message Oct 9, 2009

Share & tools

Serge E. Hallyn

author

2009-10-09 22:25 UTC #0 lore raw

PATCH 1/1 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-r/[email protected]>

---
 ipc/msg.c |    1 +
 ipc/sem.c |    1 +
 ipc/shm.c |    1 +
 3 files changed, 3 insertions(+), 0 deletions(-)

ipc/msg.c +1 -0

index 3559d53..861cc32 100644
@@ -124,6 +124,7 @@ void msg_init_ns(struct ipc_namespace *ns)
 void msg_exit_ns(struct ipc_namespace *ns)
 {
 	free_ipcs(ns, &msg_ids(ns), freeque);
+	idr_destroy(&ns->ids[IPC_MSG_IDS].ipcs_idr);
 }
 #endif

ipc/sem.c +1 -0

index 7361041..23ce7ec 100644
@@ -128,6 +128,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

ipc/shm.c +1 -0

index 26f9253..82ab773 100644
@@ -102,6 +102,7 @@ void do_shm_rmid(struct ipc_namespace *ns, struct kern_ipc_perm *ipcp)
 void shm_exit_ns(struct ipc_namespace *ns)
 {
 	free_ipcs(ns, &shm_ids(ns), do_shm_rmid);
+	idr_destroy(&ns->ids[IPC_SHM_IDS].ipcs_idr);
 }
 #endif

Signature · 1 line

1.5.4.3