summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChris Leech <cleech@redhat.com>2019-10-30 12:10:27 -0700
committerChris Leech <cleech@redhat.com>2019-10-31 15:48:08 -0700
commitaa0e934c3513ca8fac9de463e328b5a150d057f5 (patch)
treeb45b67ffaf26a42b3c8231972f4486c6b0f5a641
parent5799a5a711a0347e353cfb61b8ea33eb9d38541e (diff)
downloadopen-iscsi-aa0e934c3513ca8fac9de463e328b5a150d057f5.tar.gz
Buffer not null terminated: Calling strncpy with a maximum size argument on destination array
-rw-r--r--usr/iscsi_net_util.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/usr/iscsi_net_util.c b/usr/iscsi_net_util.c
index a32b49c..56d2f69 100644
--- a/usr/iscsi_net_util.c
+++ b/usr/iscsi_net_util.c
@@ -193,7 +193,7 @@ static char *find_vlan_dev(char *netdev, int vlan_id) {
sockfd = socket(AF_INET, SOCK_DGRAM, 0);
- strncpy(if_hwaddr.ifr_name, netdev, IFNAMSIZ);
+ strlcpy(if_hwaddr.ifr_name, netdev, IFNAMSIZ);
ioctl(sockfd, SIOCGIFHWADDR, &if_hwaddr);
if (if_hwaddr.ifr_hwaddr.sa_family != ARPHRD_ETHER)
@@ -201,14 +201,14 @@ static char *find_vlan_dev(char *netdev, int vlan_id) {
ifni = if_nameindex();
for (i = 0; ifni[i].if_index && ifni[i].if_name; i++) {
- strncpy(vlan_hwaddr.ifr_name, ifni[i].if_name, IFNAMSIZ);
+ strlcpy(vlan_hwaddr.ifr_name, ifni[i].if_name, IFNAMSIZ);
ioctl(sockfd, SIOCGIFHWADDR, &vlan_hwaddr);
if (vlan_hwaddr.ifr_hwaddr.sa_family != ARPHRD_ETHER)
continue;
if (!memcmp(if_hwaddr.ifr_hwaddr.sa_data, vlan_hwaddr.ifr_hwaddr.sa_data, ETH_ALEN)) {
- strncpy(vlanrq.device1, ifni[i].if_name, IFNAMSIZ);
+ strlcpy(vlanrq.device1, ifni[i].if_name, IFNAMSIZ);
rc = ioctl(sockfd, SIOCGIFVLAN, &vlanrq);
if ((rc == 0) && (vlanrq.u.VID == vlan_id)) {
vlan = strdup(vlanrq.device1);