lkml.org 
[lkml]   [2010]   [Jan]   [26]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Date
    From
    Subject[78/98] ipc ns: fix memory leak (idr)
    2.6.32-stable review patch.  If anyone has any objections, please let us know.

    ------------------

    From: Serge E. Hallyn <serue@us.ibm.com>

    commit 7d6feeb287c61aafa88f06345387b1188edf4b86 upstream.

    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>
    Acked-by: Nick Piggin <npiggin@suse.de>
    Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

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

    --- a/ipc/msg.c
    +++ b/ipc/msg.c
    @@ -125,6 +125,7 @@ void msg_init_ns(struct ipc_namespace *n
    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

    --- a/ipc/sem.c
    +++ b/ipc/sem.c
    @@ -129,6 +129,7 @@ void sem_init_ns(struct ipc_namespace *n
    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

    --- a/ipc/shm.c
    +++ b/ipc/shm.c
    @@ -101,6 +101,7 @@ static void do_shm_rmid(struct ipc_names
    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




    \
     
     \ /
      Last update: 2010-01-27 00:53    [W:2.518 / U:1.748 seconds]
    ©2003-2018 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site