lkml.org 
[lkml]   [2016]   [Jan]   [28]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 3.19.y-ckt 168/210] target: Fix a memory leak in target_dev_lba_map_store()
    Date
    3.19.8-ckt14 -stable review patch.  If anyone has any objections, please let me know.

    ---8<------------------------------------------------------------

    From: Bart Van Assche <bart.vanassche@sandisk.com>

    commit f0a8afecb29ad0005e7e946228a0ef5422058b85 upstream.

    strsep() modifies its first argument. Make the pointer passed to kfree()
    match the return value of kmalloc().

    Fixes: 229d4f112fd6 (commit "target_core_alua: Referrals configfs integration")
    Signed-off-by: Bart Van Assche <bart.vanassche@sandisk.com>
    Cc: Hannes Reinecke <hare@suse.com>
    Cc: Christoph Hellwig <hch@lst.de>
    Cc: Andy Grover <agrover@redhat.com>
    Cc: Sagi Grimberg <sagig@mellanox.com>
    Signed-off-by: Nicholas Bellinger <nab@linux-iscsi.org>
    Signed-off-by: Kamal Mostafa <kamal@canonical.com>
    ---
    drivers/target/target_core_configfs.c | 6 +++---
    1 file changed, 3 insertions(+), 3 deletions(-)

    diff --git a/drivers/target/target_core_configfs.c b/drivers/target/target_core_configfs.c
    index 75d89ad..186a305 100644
    --- a/drivers/target/target_core_configfs.c
    +++ b/drivers/target/target_core_configfs.c
    @@ -1645,14 +1645,14 @@ static ssize_t target_core_store_dev_lba_map(
    struct se_device *dev = p;
    struct t10_alua_lba_map *lba_map = NULL;
    struct list_head lba_list;
    - char *map_entries, *ptr;
    + char *map_entries, *orig, *ptr;
    char state;
    int pg_num = -1, pg;
    int ret = 0, num = 0, pg_id, alua_state;
    unsigned long start_lba = -1, end_lba = -1;
    unsigned long segment_size = -1, segment_mult = -1;

    - map_entries = kstrdup(page, GFP_KERNEL);
    + orig = map_entries = kstrdup(page, GFP_KERNEL);
    if (!map_entries)
    return -ENOMEM;

    @@ -1750,7 +1750,7 @@ out:
    } else
    core_alua_set_lba_map(dev, &lba_list,
    segment_size, segment_mult);
    - kfree(map_entries);
    + kfree(orig);
    return count;
    }

    --
    1.9.1
    \
     
     \ /
      Last update: 2016-01-29 03:21    [W:2.517 / U:0.108 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site