lkml.org 
[lkml]   [2017]   [Nov]   [6]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Date
    Subject[PATCH 3.16 241/294] mtd: pmcmsp: use kstrndup instead of kmalloc+strncpy
    3.16.50-rc1 review patch.  If anyone has any objections, please let me know.

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

    From: Arnd Bergmann <arnd@arndb.de>

    commit 906b268477bc03daaa04f739844c120fe4dbc991 upstream.

    kernelci.org reports a warning for this driver, as it copies a local
    variable into a 'const char *' string:

    drivers/mtd/maps/pmcmsp-flash.c:149:30: warning: passing argument 1 of 'strncpy' discards 'const' qualifier from pointer target type [-Wdiscarded-qualifiers]

    Using kstrndup() simplifies the code and avoids the warning.

    Signed-off-by: Arnd Bergmann <arnd@arndb.de>
    Acked-by: Marek Vasut <marek.vasut@gmail.com>
    Signed-off-by: Brian Norris <computersforpeace@gmail.com>
    Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
    ---
    drivers/mtd/maps/pmcmsp-flash.c | 4 +---
    1 file changed, 1 insertion(+), 3 deletions(-)

    --- a/drivers/mtd/maps/pmcmsp-flash.c
    +++ b/drivers/mtd/maps/pmcmsp-flash.c
    @@ -139,15 +139,13 @@ static int __init init_msp_flash(void)
    }

    msp_maps[i].bankwidth = 1;
    - msp_maps[i].name = kmalloc(7, GFP_KERNEL);
    + msp_maps[i].name = kstrndup(flash_name, 7, GFP_KERNEL);
    if (!msp_maps[i].name) {
    iounmap(msp_maps[i].virt);
    kfree(msp_parts[i]);
    goto cleanup_loop;
    }

    - msp_maps[i].name = strncpy(msp_maps[i].name, flash_name, 7);
    -
    for (j = 0; j < pcnt; j++) {
    part_name[5] = '0' + i;
    part_name[7] = '0' + j;
    \
     
     \ /
      Last update: 2017-11-08 20:59    [W:4.556 / U:0.660 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site