lkml.org 
[lkml]   [2015]   [Jan]   [27]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 3.4 041/177] dm log userspace: fix memory leak in dm_ulog_tfr_init failure path
    Date
    From: Alexey Khoroshilov <khoroshilov@ispras.ru>

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

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


    commit 56ec16cb1e1ce46354de8511eef962a417c32c92 upstream.

    If cn_add_callback() fails in dm_ulog_tfr_init(), it does not
    deallocate prealloced memory but calls cn_del_callback().

    Found by Linux Driver Verification project (linuxtesting.org).

    Signed-off-by: Alexey Khoroshilov <khoroshilov@ispras.ru>
    Reviewed-by: Jonathan Brassow <jbrassow@redhat.com>
    Signed-off-by: Mike Snitzer <snitzer@redhat.com>
    Signed-off-by: Zefan Li <lizefan@huawei.com>
    ---
    drivers/md/dm-log-userspace-transfer.c | 2 +-
    1 file changed, 1 insertion(+), 1 deletion(-)

    diff --git a/drivers/md/dm-log-userspace-transfer.c b/drivers/md/dm-log-userspace-transfer.c
    index 08d9a20..c69d0b7 100644
    --- a/drivers/md/dm-log-userspace-transfer.c
    +++ b/drivers/md/dm-log-userspace-transfer.c
    @@ -272,7 +272,7 @@ int dm_ulog_tfr_init(void)

    r = cn_add_callback(&ulog_cn_id, "dmlogusr", cn_ulog_callback);
    if (r) {
    - cn_del_callback(&ulog_cn_id);
    + kfree(prealloced_cn_msg);
    return r;
    }

    --
    1.9.1


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