lkml.org 
[lkml]   [2013]   [May]   [17]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Date
    From
    Subject[ 134/136 ] kernel/audit_tree.c: tree will leak memory when failure occurs in audit_trim_trees()
    3.6.11.4 stable review patch.
    If anyone has any objections, please let me know.

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

    From: Chen Gang <gang.chen@asianux.com>

    [ Upstream commit 12b2f117f3bf738c1a00a6f64393f1953a740bd4 ]

    audit_trim_trees() calls get_tree(). If a failure occurs we must call
    put_tree().

    [akpm@linux-foundation.org: run put_tree() before mutex_lock() for small scalability improvement]
    Signed-off-by: Chen Gang <gang.chen@asianux.com>
    Cc: Al Viro <viro@zeniv.linux.org.uk>
    Cc: Eric Paris <eparis@redhat.com>
    Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
    Signed-off-by: Steven Rostedt <rostedt@goodmis.org>
    ---
    kernel/audit_tree.c | 2 +-
    1 file changed, 1 insertion(+), 1 deletion(-)

    diff --git a/kernel/audit_tree.c b/kernel/audit_tree.c
    index ed206fd..23b8c66 100644
    --- a/kernel/audit_tree.c
    +++ b/kernel/audit_tree.c
    @@ -609,9 +609,9 @@ void audit_trim_trees(void)
    }
    spin_unlock(&hash_lock);
    trim_marked(tree);
    - put_tree(tree);
    drop_collected_mounts(root_mnt);
    skip_it:
    + put_tree(tree);
    mutex_lock(&audit_filter_mutex);
    }
    list_del(&cursor);
    --
    1.7.10.4



    \
     
     \ /
      Last update: 2013-05-18 06:01    [W:2.816 / U:0.092 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site