Commit f6b759f5 authored by Xu Panda's avatar Xu Panda Committed by David S. Miller
Browse files

liquidio: use strscpy() to instead of strncpy() 



The implementation of strscpy() is more robust and safer.
That's now the recommended way to copy NUL terminated strings.

Signed-off-by: default avatarXu Panda <xu.panda@zte.com.cn>
Signed-off-by: default avatarYang Yang <yang.yang29@zte.com>
Reviewed-by: default avatarJiri Pirko <jiri@nvidia.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 94d30e89

drivers/net/ethernet/cavium/liquidio/octeon_console.c

+3 −4
Original line number Diff line number Diff line
@@ -247,8 +247,7 @@ static const struct cvmx_bootmem_named_block_desc 
					struct cvmx_bootmem_named_block_desc,

					size));



		strncpy(desc->name, name, sizeof(desc->name));

		desc->name[sizeof(desc->name) - 1] = 0;

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

		return &oct->bootmem_named_block_desc;

	} else {

		return NULL;
@@ -471,8 +470,8 @@ static void output_console_line(struct octeon_device *oct, 
	if (line != &console_buffer[bytes_read]) {

		console_buffer[bytes_read] = '\0';

		len = strlen(console->leftover);

		strncpy(&console->leftover[len], line,

			sizeof(console->leftover) - len);

		strscpy(&console->leftover[len], line,

			sizeof(console->leftover) - len + 1);

	}

}