lkml.org 
[lkml]   [2018]   [Mar]   [19]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 4.9 001/241] blkcg: fix double free of new_blkg in blkcg_init_queue
    Date
    4.9-stable review patch.  If anyone has any objections, please let me know.

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

    From: Hou Tao <houtao1@huawei.com>

    commit 9b54d816e00425c3a517514e0d677bb3cec49258 upstream.

    If blkg_create fails, new_blkg passed as an argument will
    be freed by blkg_create, so there is no need to free it again.

    Signed-off-by: Hou Tao <houtao1@huawei.com>
    Signed-off-by: Jens Axboe <axboe@fb.com>
    Cc: Guenter Roeck <linux@roeck-us.net>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

    ---
    block/blk-cgroup.c | 4 +---
    1 file changed, 1 insertion(+), 3 deletions(-)

    --- a/block/blk-cgroup.c
    +++ b/block/blk-cgroup.c
    @@ -1078,10 +1078,8 @@ int blkcg_init_queue(struct request_queu
    if (preloaded)
    radix_tree_preload_end();

    - if (IS_ERR(blkg)) {
    - blkg_free(new_blkg);
    + if (IS_ERR(blkg))
    return PTR_ERR(blkg);
    - }

    q->root_blkg = blkg;
    q->root_rl.blkg = blkg;

    \
     
     \ /
      Last update: 2018-03-19 21:03    [W:4.247 / U:0.836 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site