Commit e76b8c1d authored by Heiko Carstens's avatar Heiko Carstens
Browse files

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: default avatarMikhail Zaslonko <zaslonko@linux.ibm.com>
Signed-off-by: default avatarHeiko Carstens <hca@linux.ibm.com>
parent e75003a7

arch/s390/kernel/crash_dump.c

+1 −1
Original line number Diff line number Diff line
@@ -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);

}

arch/s390/kernel/processor.c

+8 −8
Original line number Diff line number Diff line
@@ -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;

drivers/s390/block/dcssblk.c

+2 −2
Original line number Diff line number Diff line
@@ -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);

		}

drivers/s390/net/ctcm_mpc.c

+1 −1
Original line number Diff line number Diff line
@@ -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++;