s390: Simple strcpy() to strscpy() conversions

Convert all strcpy() usages to strscpy() where the conversion means
just replacing strcpy() with strscpy(). strcpy() is deprecated since
it performs no bounds checking on the destination buffer.

Reviewed-by: Mikhail Zaslonko <zaslonko@linux.ibm.com>
Signed-off-by: Heiko Carstens <hca@linux.ibm.com>

diff --git a/arch/s390/kernel/crash_dump.c b/arch/s390/kernel/crash_dump.c
index 4a981266b483376af4370e29d47418539fc684c9..adb164223f8c6d5242abf2046e10e1d3c5cc5fb0 100644 (file)
--- a/arch/s390/kernel/crash_dump.c
+++ b/arch/s390/kernel/crash_dump.c
@@ -354,7 +354,7 @@ static void *nt_prpsinfo(void *ptr)
 
        memset(&prpsinfo, 0, sizeof(prpsinfo));
        prpsinfo.pr_sname = 'R';
-       strcpy(prpsinfo.pr_fname, "vmlinux");
+       strscpy(prpsinfo.pr_fname, "vmlinux");
        return nt_init(ptr, PRPSINFO, prpsinfo);
 }
 

diff --git a/arch/s390/kernel/processor.c b/arch/s390/kernel/processor.c
index 80b1f7a29f11641a6270b63ceb5e985f94d10e54..11f70c1e2797cb1c44479d261b526f4a2232ac59 100644 (file)
--- a/arch/s390/kernel/processor.c
+++ b/arch/s390/kernel/processor.c
@@ -268,35 +268,35 @@ static int __init setup_elf_platform(void)
        add_device_randomness(&cpu_id, sizeof(cpu_id));
        switch (cpu_id.machine) {
        default:        /* Use "z10" as default. */
-               strcpy(elf_platform, "z10");
+               strscpy(elf_platform, "z10");
                break;
        case 0x2817:
        case 0x2818:
-               strcpy(elf_platform, "z196");
+               strscpy(elf_platform, "z196");
                break;
        case 0x2827:
        case 0x2828:
-               strcpy(elf_platform, "zEC12");
+               strscpy(elf_platform, "zEC12");
                break;
        case 0x2964:
        case 0x2965:
-               strcpy(elf_platform, "z13");
+               strscpy(elf_platform, "z13");
                break;
        case 0x3906:
        case 0x3907:
-               strcpy(elf_platform, "z14");
+               strscpy(elf_platform, "z14");
                break;
        case 0x8561:
        case 0x8562:
-               strcpy(elf_platform, "z15");
+               strscpy(elf_platform, "z15");
                break;
        case 0x3931:
        case 0x3932:
-               strcpy(elf_platform, "z16");
+               strscpy(elf_platform, "z16");
                break;
        case 0x9175:
        case 0x9176:
-               strcpy(elf_platform, "z17");
+               strscpy(elf_platform, "z17");
                break;
        }
        return 0;

diff --git a/drivers/s390/block/dcssblk.c b/drivers/s390/block/dcssblk.c
index 7248e547fefb797a02ada20e32b92a7e4e4e9d9b..cdc7b2f16b884f17516944dde0f50153578d8d0c 100644 (file)
--- a/drivers/s390/block/dcssblk.c
+++ b/drivers/s390/block/dcssblk.c
@@ -314,7 +314,7 @@ dcssblk_load_segment(char *name, struct segment_info **seg_info)
        if (*seg_info == NULL)
                return -ENOMEM;
 
-       strcpy((*seg_info)->segment_name, name);
+       strscpy((*seg_info)->segment_name, name);
 
        /* load the segment */
        rc = segment_load(name, SEGMENT_SHARED,
@@ -612,7 +612,7 @@ dcssblk_add_store(struct device *dev, struct device_attribute *attr, const char
                                rc = -ENOMEM;
                                goto out;
                        }
-                       strcpy(dev_info->segment_name, local_buf);
+                       strscpy(dev_info->segment_name, local_buf);
                        dev_info->segment_type = seg_info->segment_type;
                        INIT_LIST_HEAD(&dev_info->seg_list);
                }

diff --git a/drivers/s390/net/ctcm_mpc.c b/drivers/s390/net/ctcm_mpc.c
index 9e580ef69bdaabe69128399baba45f8e957691b3..aaa1eea6149b6b513cd00a87c9290d88e9a9ddcc 100644 (file)
--- a/drivers/s390/net/ctcm_mpc.c
+++ b/drivers/s390/net/ctcm_mpc.c
@@ -179,7 +179,7 @@ void ctcmpc_dumpit(char *buf, int len)
                        ctcm_pr_debug("   %s (+%s) : %s  [%s]\n",
                                        addr, boff, bhex, basc);
                        dup = 0;
-                       strcpy(duphex, bhex);
+                       strscpy(duphex, bhex);
                } else
                        dup++;