lkml.org 
[lkml]   [2016]   [Oct]   [12]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 3.4 069/125] dm btree: fix leak of bufio-backed block in btree_split_sibling error path
    Date
    From: Mike Snitzer <snitzer@redhat.com>

    3.4.113-rc1 review patch. If anyone has any objections, please let me know.

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


    commit 30ce6e1cc5a0f781d60227e9096c86e188d2c2bd upstream.

    The block allocated at the start of btree_split_sibling() is never
    released if later insert_at() fails.

    Fix this by releasing the previously allocated bufio block using
    unlock_block().

    Reported-by: Mikulas Patocka <mpatocka@redhat.com>
    Signed-off-by: Mike Snitzer <snitzer@redhat.com>
    Signed-off-by: Zefan Li <lizefan@huawei.com>
    ---
    drivers/md/persistent-data/dm-btree.c | 4 +++-
    1 file changed, 3 insertions(+), 1 deletion(-)

    diff --git a/drivers/md/persistent-data/dm-btree.c b/drivers/md/persistent-data/dm-btree.c
    index be86d59..77c615e 100644
    --- a/drivers/md/persistent-data/dm-btree.c
    +++ b/drivers/md/persistent-data/dm-btree.c
    @@ -450,8 +450,10 @@ static int btree_split_sibling(struct shadow_spine *s, dm_block_t root,

    r = insert_at(sizeof(__le64), pn, parent_index + 1,
    le64_to_cpu(rn->keys[0]), &location);
    - if (r)
    + if (r) {
    + unlock_block(s->info, right);
    return r;
    + }

    if (key < le64_to_cpu(rn->keys[0])) {
    unlock_block(s->info, right);
    --
    1.9.1
    \
     
     \ /
      Last update: 2016-10-12 14:42    [W:2.674 / U:0.060 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site