From: Samuel Thibault <samuel.thibault@ens-lyon.org>
Date: Tue, 3 Apr 2018 16:06:15 +0000 (+0200)
Subject: hurd: Fix buffer overrun in __if_nametoindex
X-Git-Tag: glibc-2.28~390
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=511ed56f2e792bea5e7145e1d5d5c93b9f47c41f;p=thirdparty%2Fglibc.git

hurd: Fix buffer overrun in __if_nametoindex

and building with mainline GCC which reports it.

	* sysdeps/mach/hurd/if_index.c (__if_nametoindex): Always end
	ifr.fr_name with a NUL caracter.
---

diff --git a/ChangeLog b/ChangeLog
index 36b022cb355..28fa4a5e695 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2018-04-03  Samuel Thibault  <samuel.thibault@ens-lyon.org>
+
+	* sysdeps/mach/hurd/if_index.c (__if_nametoindex): Always end
+	ifr.fr_name with a NUL caracter.
+
 2018-04-03  Wilco Dijkstra  <wdijkstr@arm.com>
 
 	* sysdeps/ieee754/dbl-64/s_sin.c (__sin): Cleanup ifdefs.
diff --git a/sysdeps/mach/hurd/if_index.c b/sysdeps/mach/hurd/if_index.c
index d637353d74b..7f647b70362 100644
--- a/sysdeps/mach/hurd/if_index.c
+++ b/sysdeps/mach/hurd/if_index.c
@@ -37,7 +37,9 @@ __if_nametoindex (const char *ifname)
   if (fd < 0)
     return 0;
 
-  strncpy (ifr.ifr_name, ifname, IFNAMSIZ);
+  strncpy (ifr.ifr_name, ifname, IFNAMSIZ - 1);
+  ifr.ifr_name[IFNAMESIZ - 1] = '\0';
+
   if (__ioctl (fd, SIOCGIFINDEX, &ifr) < 0)
     {
       int saved_errno = errno;