diff options
| author | Serge E. Hallyn <serue@us.ibm.com> | 2009-12-15 19:47:27 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-12-16 10:20:09 -0500 |
| commit | 7d6feeb287c61aafa88f06345387b1188edf4b86 (patch) | |
| tree | b07d1033d8980256d596686d75c2207b1f2cce0a /ipc | |
| parent | 1be53963b0519bd3681749a9bed8b83aeb005cca (diff) | |
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')
| -rw-r--r-- | ipc/msg.c | 1 | ||||
| -rw-r--r-- | ipc/sem.c | 1 | ||||
| -rw-r--r-- | ipc/shm.c | 1 |
3 files changed, 3 insertions, 0 deletions
| @@ -125,6 +125,7 @@ void msg_init_ns(struct ipc_namespace *ns) | |||
| 125 | void msg_exit_ns(struct ipc_namespace *ns) | 125 | void msg_exit_ns(struct ipc_namespace *ns) |
| 126 | { | 126 | { |
| 127 | free_ipcs(ns, &msg_ids(ns), freeque); | 127 | free_ipcs(ns, &msg_ids(ns), freeque); |
| 128 | idr_destroy(&ns->ids[IPC_MSG_IDS].ipcs_idr); | ||
| 128 | } | 129 | } |
| 129 | #endif | 130 | #endif |
| 130 | 131 | ||
| @@ -129,6 +129,7 @@ void sem_init_ns(struct ipc_namespace *ns) | |||
| 129 | void sem_exit_ns(struct ipc_namespace *ns) | 129 | void sem_exit_ns(struct ipc_namespace *ns) |
| 130 | { | 130 | { |
| 131 | free_ipcs(ns, &sem_ids(ns), freeary); | 131 | free_ipcs(ns, &sem_ids(ns), freeary); |
| 132 | idr_destroy(&ns->ids[IPC_SEM_IDS].ipcs_idr); | ||
| 132 | } | 133 | } |
| 133 | #endif | 134 | #endif |
| 134 | 135 | ||
| @@ -101,6 +101,7 @@ static void do_shm_rmid(struct ipc_namespace *ns, struct kern_ipc_perm *ipcp) | |||
| 101 | void shm_exit_ns(struct ipc_namespace *ns) | 101 | void shm_exit_ns(struct ipc_namespace *ns) |
| 102 | { | 102 | { |
| 103 | free_ipcs(ns, &shm_ids(ns), do_shm_rmid); | 103 | free_ipcs(ns, &shm_ids(ns), do_shm_rmid); |
| 104 | idr_destroy(&ns->ids[IPC_SHM_IDS].ipcs_idr); | ||
| 104 | } | 105 | } |
| 105 | #endif | 106 | #endif |
| 106 | 107 | ||
