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

s390: Remove optional third argument of strscpy() if possible 



The third argument of strscpy() is optional and can be left away iff
the destination is an array and the maximum size of the copy is the
size of destination.
Remove the third argument for those cases where this is possible.

Acked-by: default avatarAlexander Gordeev <agordeev@linux.ibm.com>
Signed-off-by: default avatarHeiko Carstens <hca@linux.ibm.com>
parent 2eba6f9e

arch/s390/kernel/cert_store.c

+1 −1
Original line number Diff line number Diff line
@@ -138,7 +138,7 @@ static void cert_store_key_describe(const struct key *key, struct seq_file *m) 
	 * First 64 bytes of the key description is key name in EBCDIC CP 500.

	 * Convert it to ASCII for displaying in /proc/keys.

	 */

	strscpy(ascii, key->description, sizeof(ascii));

	strscpy(ascii, key->description);

	EBCASC_500(ascii, VC_NAME_LEN_BYTES);

	seq_puts(m, ascii);

arch/s390/kernel/debug.c

+1 −1
Original line number Diff line number Diff line
@@ -251,7 +251,7 @@ static debug_info_t *debug_info_alloc(const char *name, int pages_per_area, 
	rc->level	   = level;

	rc->buf_size	   = buf_size;

	rc->entry_size	   = sizeof(debug_entry_t) + buf_size;

	strscpy(rc->name, name, sizeof(rc->name));

	strscpy(rc->name, name);

	memset(rc->views, 0, DEBUG_MAX_VIEWS * sizeof(struct debug_view *));

	memset(rc->debugfs_entries, 0, DEBUG_MAX_VIEWS * sizeof(struct dentry *));

	refcount_set(&(rc->ref_count), 0);

arch/s390/kernel/ipl.c

+1 −1
Original line number Diff line number Diff line
@@ -270,7 +270,7 @@ static ssize_t sys_##_prefix##_##_name##_store(struct kobject *kobj, \ 
{									\

	if (len >= sizeof(_value))					\

		return -E2BIG;						\

	len = strscpy(_value, buf, sizeof(_value));			\

	len = strscpy(_value, buf);					\

	if ((ssize_t)len < 0)						\

		return len;						\

	strim(_value);							\

drivers/s390/char/diag_ftp.c

+1 −1
Original line number Diff line number Diff line
@@ -159,7 +159,7 @@ ssize_t diag_ftp_cmd(const struct hmcdrv_ftp_cmdspec *ftp, size_t *fsize) 
		goto out;

	}



	len = strscpy(ldfpl->fident, ftp->fname, sizeof(ldfpl->fident));

	len = strscpy(ldfpl->fident, ftp->fname);

	if (len < 0) {

		len = -EINVAL;

		goto out_free;