]> asedeno.scripts.mit.edu Git - linux.git/commitdiff
powerpc/qe: Use strlcpy()
authorRickard Strandqvist <rickard_strandqvist@spectrumdigital.se>
Sat, 26 Jul 2014 21:26:51 +0000 (23:26 +0200)
committerScott Wood <scottwood@freescale.com>
Fri, 30 Jan 2015 05:32:13 +0000 (23:32 -0600)
Replace strcpy and strncpy with strlcpy to avoid strings that are too
big, or lack null termination.

Signed-off-by: Rickard Strandqvist <rickard_strandqvist@spectrumdigital.se>
[scottwood@freescale.com: cleaned up commit message]
Signed-off-by: Scott Wood <scottwood@freescale.com>
arch/powerpc/sysdev/qe_lib/qe.c

index 1f29cee8da7b0ab88c612d165d2ec5693b9e3f55..c2518cdb7ddb6e94822138e7c702d9242b444f86 100644 (file)
@@ -497,7 +497,7 @@ int qe_upload_firmware(const struct qe_firmware *firmware)
         * saved microcode information and put in the new.
         */
        memset(&qe_firmware_info, 0, sizeof(qe_firmware_info));
-       strcpy(qe_firmware_info.id, firmware->id);
+       strlcpy(qe_firmware_info.id, firmware->id, sizeof(qe_firmware_info.id));
        qe_firmware_info.extended_modes = firmware->extended_modes;
        memcpy(qe_firmware_info.vtraps, firmware->vtraps,
                sizeof(firmware->vtraps));
@@ -583,8 +583,8 @@ struct qe_firmware_info *qe_get_firmware_info(void)
        /* Copy the data into qe_firmware_info*/
        sprop = of_get_property(fw, "id", NULL);
        if (sprop)
-               strncpy(qe_firmware_info.id, sprop,
-                       sizeof(qe_firmware_info.id) - 1);
+               strlcpy(qe_firmware_info.id, sprop,
+                       sizeof(qe_firmware_info.id));
 
        prop = of_find_property(fw, "extended-modes", NULL);
        if (prop && (prop->length == sizeof(u64))) {