lkml.org 
[lkml]   [2015]   [Jun]   [23]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 2/7] blkcg: use blkg_free() in blkcg_init_queue() failure path
    Date
    When blkcg_init_queue() fails midway after creating a new blkg, it
    performs kfree() directly; however, this doesn't free the policy data
    areas. Make it use blkg_free() instead. In turn, blkg_free() is
    updated to handle root request_list special case.

    While this fixes a possible memory leak, it's on an unlikely failure
    path of an already cold path and the size leaked per occurrence is
    miniscule too. I don't think it needs to be tagged for -stable.

    Signed-off-by: Tejun Heo <tj@kernel.org>
    Cc: Vivek Goyal <vgoyal@redhat.com>
    ---
    block/blk-cgroup.c | 5 +++--
    1 file changed, 3 insertions(+), 2 deletions(-)

    diff --git a/block/blk-cgroup.c b/block/blk-cgroup.c
    index 1fddbbd..898f560 100644
    --- a/block/blk-cgroup.c
    +++ b/block/blk-cgroup.c
    @@ -57,7 +57,8 @@ static void blkg_free(struct blkcg_gq *blkg)
    for (i = 0; i < BLKCG_MAX_POLS; i++)
    kfree(blkg->pd[i]);

    - blk_exit_rl(&blkg->rl);
    + if (blkg->blkcg != &blkcg_root)
    + blk_exit_rl(&blkg->rl);
    kfree(blkg);
    }

    @@ -886,7 +887,7 @@ int blkcg_init_queue(struct request_queue *q)
    radix_tree_preload_end();

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

    --
    2.4.3


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