lkml.org 
[lkml]   [2012]   [Sep]   [12]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[ 043/108] audit: dont free_chunk() after fsnotify_add_mark()
    Date
    From: Greg KH <gregkh@linuxfoundation.org>

    3.5-stable review patch. If anyone has any objections, please let me know.

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

    From: Miklos Szeredi <mszeredi@suse.cz>

    commit 0fe33aae0e94b4097dd433c9399e16e17d638cd8 upstream.

    Don't do free_chunk() after fsnotify_add_mark(). That one does a delayed unref
    via the destroy list and this results in use-after-free.

    Signed-off-by: Miklos Szeredi <mszeredi@suse.cz>
    Acked-by: Eric Paris <eparis@redhat.com>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

    ---
    kernel/audit_tree.c | 6 +++---
    1 file changed, 3 insertions(+), 3 deletions(-)

    --- a/kernel/audit_tree.c
    +++ b/kernel/audit_tree.c
    @@ -259,7 +259,7 @@ static void untag_chunk(struct node *p)

    fsnotify_duplicate_mark(&new->mark, entry);
    if (fsnotify_add_mark(&new->mark, new->mark.group, new->mark.i.inode, NULL, 1)) {
    - free_chunk(new);
    + fsnotify_put_mark(&new->mark);
    goto Fallback;
    }

    @@ -322,7 +322,7 @@ static int create_chunk(struct inode *in

    entry = &chunk->mark;
    if (fsnotify_add_mark(entry, audit_tree_group, inode, NULL, 0)) {
    - free_chunk(chunk);
    + fsnotify_put_mark(entry);
    return -ENOSPC;
    }

    @@ -396,7 +396,7 @@ static int tag_chunk(struct inode *inode
    fsnotify_duplicate_mark(chunk_entry, old_entry);
    if (fsnotify_add_mark(chunk_entry, chunk_entry->group, chunk_entry->i.inode, NULL, 1)) {
    spin_unlock(&old_entry->lock);
    - free_chunk(chunk);
    + fsnotify_put_mark(chunk_entry);
    fsnotify_put_mark(old_entry);
    return -ENOSPC;
    }



    \
     
     \ /
      Last update: 2012-09-13 03:41    [W:4.655 / U:0.068 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site