From e7cfd9c561e1c9856588a50f420911235e4d0772 Mon Sep 17 00:00:00 2001 From: Tianhua Sun Date: Tue, 11 Jun 2019 10:22:27 +0800 Subject: [PATCH] dm: fix strncpy null-terminated issues Fix strncpy null-terminated issues. Tracked-On: #3332 Signed-off-by: Tianhua Sun Acked-by: Anthony Xu --- devicemodel/hw/pci/virtio/virtio_net.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/devicemodel/hw/pci/virtio/virtio_net.c b/devicemodel/hw/pci/virtio/virtio_net.c index 1a71dae5b..6efd12607 100644 --- a/devicemodel/hw/pci/virtio/virtio_net.c +++ b/devicemodel/hw/pci/virtio/virtio_net.c @@ -642,8 +642,10 @@ virtio_net_tap_open(char *devname) memset(&ifr, 0, sizeof(ifr)); ifr.ifr_flags = IFF_TAP | IFF_NO_PI; - if (*devname) + if (*devname) { strncpy(ifr.ifr_name, devname, IFNAMSIZ); + ifr.ifr_name[IFNAMSIZ - 1] = '\0'; + } rc = ioctl(tunfd, TUNSETIFF, (void *)&ifr); if (rc < 0) { @@ -654,6 +656,7 @@ virtio_net_tap_open(char *devname) } strncpy(devname, ifr.ifr_name, IFNAMSIZ); + devname[IFNAMSIZ - 1] = '\0'; return tunfd; }