commit 05755b29e63a9c73ba29c8b7c632570727d7afe7
author Andre Przywara <andre.przywara@arm.com> Mon Feb 04 16:34:57 2019 +0000
committer Will Deacon <will.deacon@arm.com> Fri Feb 08 16:21:57 2019 +0000
tree 8fee1a504cf32027381d501e03f96ba70aac0929
parent 266a0ed4c6a50dd80e7586ea020c5e963f4dd37b

virtio: use strlcpy

GCC 8.x complains about improper usage of strncpy in virtio/net.c and
virtio/scsi.c:
In function 'virtio_scsi_init_one',
    inlined from 'virtio_scsi_init' at virtio/scsi.c:285:7:
virtio/scsi.c:247:2: error: 'strncpy' specified bound 224 equals destination size [-Werror=stringop-truncation]
  strncpy((char *)&sdev->target.vhost_wwpn, disk->wwpn, sizeof(sdev->target.vhost_wwpn));
  ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~

Fix this and the other occurences in virtio/ by using strlcpy instead
of strncpy.

Signed-off-by: Andre Przywara <andre.przywara@arm.com>
Signed-off-by: Will Deacon <will.deacon@arm.com>

virtio/net.c

diff --git a/virtio/net.c b/virtio/net.c
index 35ff2e9..0914069 100644
--- a/virtio/net.c
+++ b/virtio/net.c
@@ -8,6 +8,7 @@
 #include "kvm/uip.h"
 #include "kvm/guest_compat.h"
 #include "kvm/iovec.h"
+#include "kvm/strbuf.h"
 
 #include <linux/vhost.h>
 #include <linux/virtio_net.h>
@@ -283,12 +284,12 @@
 	memset(ifr, 0, sizeof(*ifr));
 	ifr->ifr_flags = IFF_TAP | IFF_NO_PI | IFF_VNET_HDR;
 	if (tapname)
-		strncpy(ifr->ifr_name, tapname, sizeof(ifr->ifr_name));
+		strlcpy(ifr->ifr_name, tapname, sizeof(ifr->ifr_name));
 
 	ret = ioctl(ndev->tap_fd, TUNSETIFF, ifr);
 
 	if (ret >= 0)
-		strncpy(ndev->tap_name, ifr->ifr_name, sizeof(ndev->tap_name));
+		strlcpy(ndev->tap_name, ifr->ifr_name, sizeof(ndev->tap_name));
 	return ret;
 }
 

virtio/scsi.c

diff --git a/virtio/scsi.c b/virtio/scsi.c
index c8400b6..a72bb2a 100644
--- a/virtio/scsi.c
+++ b/virtio/scsi.c
@@ -8,6 +8,7 @@
 #include "kvm/guest_compat.h"
 #include "kvm/virtio-pci.h"
 #include "kvm/virtio.h"
+#include "kvm/strbuf.h"
 
 #include <linux/kernel.h>
 #include <linux/virtio_scsi.h>
@@ -255,7 +256,7 @@
 		},
 		.kvm			= kvm,
 	};
-	strncpy((char *)&sdev->target.vhost_wwpn, disk->wwpn, sizeof(sdev->target.vhost_wwpn));
+	strlcpy((char *)&sdev->target.vhost_wwpn, disk->wwpn, sizeof(sdev->target.vhost_wwpn));
 	sdev->target.vhost_tpgt = strtol(disk->tpgt, NULL, 0);
 
 	virtio_init(kvm, sdev, &sdev->vdev, &scsi_dev_virtio_ops,