Skip to contentSkip to conversation

Patch "mtd: pmcmsp: use kstrndup instead of kmalloc+strncpy" has been added to the 4.10-stable tree

PATCH [email protected] 1 participant 1 message Mar 15, 2017

Subsystems (2)
lore
Share & tools
lore

[email protected]

author maintainer Applied
#0 lore raw

This is a note to let you know that I've just added the patch titled

mtd: pmcmsp: use kstrndup instead of kmalloc+strncpy

to the 4.10-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary

The filename of the patch is:
mtd-pmcmsp-use-kstrndup-instead-of-kmalloc-strncpy.patch
and it can be found in the queue-4.10 subdirectory.

If you, or anyone else, feels it should not be added to the stable tree, please let <[email protected]> know about it.

Quoted 1 line

From 906b268477bc03daaa04f739844c120fe4dbc991 Mon Sep 17 00:00:00 2001

From: Arnd Bergmann <[email protected]>
Date: Fri, 3 Feb 2017 10:49:17 +0100
Subject: mtd: pmcmsp: use kstrndup instead of kmalloc+strncpy

From: Arnd Bergmann <[email protected]>

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.

---
 drivers/mtd/maps/pmcmsp-flash.c |    4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)
drivers/mtd/maps/pmcmsp-flash.c +1 -3
@@ -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;

Patches currently in stable-queue which might be from [email protected] are

queue-4.10/mips-ip27-disable-qlge-driver-in-defconfig.patch queue-4.10/mips-update-ip27_defconfig-for-scsi_dh-change.patch queue-4.10/mtd-pmcmsp-use-kstrndup-instead-of-kmalloc-strncpy.patch queue-4.10/mips-vdso-avoid-duplicate-cac_base-definition.patch queue-4.10/mips-ip22-fix-ip28-build-for-modern-gcc.patch queue-4.10/mips-update-lemote2f_defconfig-for-cpu_freq_stat-change.patch queue-4.10/crypto-improve-gcc-optimization-flags-for-serpent-and-wp512.patch queue-4.10/mips-ralink-remove-unused-rt-_wdt_reset-functions.patch queue-4.10/mips-ralink-remove-unused-timer-functions.patch queue-4.10/mips-update-defconfigs-for-nf_ct_proto_dccp-udplite-change.patch