Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 276d6050 authored by Vasily Gorbik's avatar Vasily Gorbik Committed by Martin Schwidefsky
Browse files

s390/tape: fix gcc 8 stringop-truncation warning 



Replace strncpy which is used to deliberately avoid string NUL-termination
with memcpy. This allows to get rid of gcc 8 stringop-truncation warning:

    inlined from 'ext_to_int_kekl' at drivers/s390/char/tape_3590.c:123:2:
./include/linux/string.h:246:9: warning: '__builtin_strncpy'
output may be truncated copying 64 bytes from a string of length 64
[-Wstringop-truncation]

Also replaces "for" loop on memset.

Reviewed-by: default avatarHeiko Carstens <heiko.carstens@de.ibm.com>
Signed-off-by: default avatarVasily Gorbik <gor@linux.ibm.com>
Signed-off-by: default avatarMartin Schwidefsky <schwidefsky@de.ibm.com>
parent 5d2f6e26

drivers/s390/char/tape_3590.c

+4 −4
Original line number Diff line number Diff line
@@ -113,16 +113,16 @@ static int crypt_enabled(struct tape_device *device) 
static void ext_to_int_kekl(struct tape390_kekl *in,

			    struct tape3592_kekl *out)

{

	int i;

	int len;



	memset(out, 0, sizeof(*out));

	if (in->type == TAPE390_KEKL_TYPE_HASH)

		out->flags |= 0x40;

	if (in->type_on_tape == TAPE390_KEKL_TYPE_HASH)

		out->flags |= 0x80;

	strncpy(out->label, in->label, 64);

	for (i = strlen(in->label); i < sizeof(out->label); i++)

		out->label[i] = ' ';

	len = min(sizeof(out->label), strlen(in->label));

	memcpy(out->label, in->label, len);

	memset(out->label + len, ' ', sizeof(out->label) - len);

	ASCEBC(out->label, sizeof(out->label));

}