From: Quentin Young <qlyoung@cumulusnetworks.com>
Date: Tue, 5 Mar 2019 19:29:49 +0000 (+0000)
Subject: Revert "nhrpd: strncpy -> strlcpy"
X-Git-Tag: 7.1_pulled~196
X-Git-Url: https://git.puffer.fish/?a=commitdiff_plain;h=b19abe1131daa38d1d0e31c4793925bb89f11c07;p=matthieu%2Ffrr.git

Revert "nhrpd: strncpy -> strlcpy"

This reverts commit eb266ecb847b70bcf9901da5ed59a39d3e07fd8f.
---

diff --git a/nhrpd/linux.c b/nhrpd/linux.c
index bb5ce0fec6..85e941e7ba 100644
--- a/nhrpd/linux.c
+++ b/nhrpd/linux.c
@@ -110,7 +110,7 @@ static int linux_configure_arp(const char *iface, int on)
 {
 	struct ifreq ifr;
 
-	strlcpy(ifr.ifr_name, iface, sizeof(ifr.ifr_name));
+	strncpy(ifr.ifr_name, iface, IFNAMSIZ - 1);
 	if (ioctl(nhrp_socket_fd, SIOCGIFFLAGS, &ifr))
 		return -1;
 
diff --git a/nhrpd/vici.c b/nhrpd/vici.c
index fab99588c8..3de4609a2b 100644
--- a/nhrpd/vici.c
+++ b/nhrpd/vici.c
@@ -550,7 +550,7 @@ int sock_open_unix(const char *path)
 
 	memset(&addr, 0, sizeof(struct sockaddr_un));
 	addr.sun_family = AF_UNIX;
-	strlcpy(addr.sun_path, path, sizeof(addr.sun_path));
+	strncpy(addr.sun_path, path, sizeof(addr.sun_path) - 1);
 
 	ret = connect(fd, (struct sockaddr *)&addr,
 		      sizeof(addr.sun_family) + strlen(addr.sun_path));