OSDN Git Service

liquidio: use strscpy() to instead of strncpy()
authorXu Panda <xu.panda@zte.com.cn>
Fri, 9 Dec 2022 07:34:49 +0000 (15:34 +0800)
committerDavid S. Miller <davem@davemloft.net>
Mon, 12 Dec 2022 10:00:55 +0000 (10:00 +0000)
The implementation of strscpy() is more robust and safer.
That's now the recommended way to copy NUL terminated strings.

Signed-off-by: Xu Panda <xu.panda@zte.com.cn>
Signed-off-by: Yang Yang <yang.yang29@zte.com>
Reviewed-by: Jiri Pirko <jiri@nvidia.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
drivers/net/ethernet/cavium/liquidio/octeon_console.c

index 28feabe..67c3570 100644 (file)
@@ -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);
        }
 }