virtio_console: use strscpy to instead of strncpy()

[PATCH linux-next] virtio_console: use strscpy to instead of strncpy()

yang.yang29@zte.com.cn posted 1 patch 2 years, 9 months ago

Download mbox

drivers/char/virtio_console.c | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)

Expand all Fold all

[PATCH linux-next] virtio_console: use strscpy to instead of strncpy()

Posted by yang.yang29@zte.com.cn 2 years, 9 months ago

From: Xu Panda <xu.panda@zte.com.cn>

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>
---
 drivers/char/virtio_console.c | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/drivers/char/virtio_console.c b/drivers/char/virtio_console.c
index 6a821118d553..d5ac4d955bc8 100644
--- a/drivers/char/virtio_console.c
+++ b/drivers/char/virtio_console.c
@@ -1666,9 +1666,8 @@ static void handle_control_message(struct virtio_device *vdev,
 				"Not enough space to store port name\n");
 			break;
 		}
-		strncpy(port->name, buf->buf + buf->offset + sizeof(*cpkt),
-			name_size - 1);
-		port->name[name_size - 1] = 0;
+		strscpy(port->name, buf->buf + buf->offset + sizeof(*cpkt),
+			name_size);

 		/*
 		 * Since we only have one sysfs attribute, 'name',
-- 
2.15.2