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

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
...@@ -247,8 +247,7 @@ static const struct cvmx_bootmem_named_block_desc ...@@ -247,8 +247,7 @@ static const struct cvmx_bootmem_named_block_desc
struct cvmx_bootmem_named_block_desc, struct cvmx_bootmem_named_block_desc,
size)); size));
strncpy(desc->name, name, sizeof(desc->name)); strscpy(desc->name, name, sizeof(desc->name));
desc->name[sizeof(desc->name) - 1] = 0;
return &oct->bootmem_named_block_desc; return &oct->bootmem_named_block_desc;
} else { } else {
return NULL; return NULL;
...@@ -471,8 +470,8 @@ static void output_console_line(struct octeon_device *oct, ...@@ -471,8 +470,8 @@ static void output_console_line(struct octeon_device *oct,
if (line != &console_buffer[bytes_read]) { if (line != &console_buffer[bytes_read]) {
console_buffer[bytes_read] = '\0'; console_buffer[bytes_read] = '\0';
len = strlen(console->leftover); len = strlen(console->leftover);
strncpy(&console->leftover[len], line, strscpy(&console->leftover[len], line,
sizeof(console->leftover) - len); sizeof(console->leftover) - len + 1);
} }
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment