shinys000114/linux
1
0
Fork 0
mirror of https://github.com/hardkernel/linux.git synced 2026-06-10 12:57:06 +09:00
Code Issues Packages Projects Releases Wiki Activity

mtd: pmcmsp: use kstrndup instead of kmalloc+strncpy

Browse Source 
commit 906b268477 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: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Arnd Bergmann
2017-02-03 10:49:17 +01:00
committed by Greg Kroah-Hartman
parent d2a8d746ae
commit 3dc8f1e3a8
1 changed files with 1 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
drivers/mtd/maps/pmcmsp-flash.c
View File

@@ -139,15 +139,13 @@ static int __init init_msp_flash(void)
} }
msp_maps[i].bankwidth = 1; 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) { if (!msp_maps[i].name) {
iounmap(msp_maps[i].virt); iounmap(msp_maps[i].virt);
kfree(msp_parts[i]); kfree(msp_parts[i]);
goto cleanup_loop; goto cleanup_loop;
} }
msp_maps[i].name = strncpy(msp_maps[i].name, flash_name, 7);
for (j = 0; j < pcnt; j++) { for (j = 0; j < pcnt; j++) {
part_name[5] = '0' + i; part_name[5] = '0' + i;
part_name[7] = '0' + j; part_name[7] = '0' + j;