From: Samuel Thibault <samuel.thibault@ens-lyon.org>
Date: Tue, 3 Apr 2018 21:13:13 +0000 (+0200)
Subject: hurd: Make __if_nametoindex return ENODEV if ifname is too long
X-Git-Tag: glibc-2.28~385
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=92846492dc3ae0be25e7ea93daf42b08906068d9;p=thirdparty%2Fglibc.git

hurd: Make __if_nametoindex return ENODEV if ifname is too long

rather than truncating it.

	* sysdeps/mach/hurd/if_index.c (__if_nametoindex): Return ENODEV if
	ifname is too long.
---

diff --git a/ChangeLog b/ChangeLog
index dd78bf691a1..cc9613239de 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -35,8 +35,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.
+	* sysdeps/mach/hurd/if_index.c (__if_nametoindex): Return ENODEV if
+	ifname is too long.
 
 2018-04-03  Wilco Dijkstra  <wdijkstr@arm.com>
 
diff --git a/sysdeps/mach/hurd/if_index.c b/sysdeps/mach/hurd/if_index.c
index 7f647b70362..b56bfc7ecdd 100644
--- a/sysdeps/mach/hurd/if_index.c
+++ b/sysdeps/mach/hurd/if_index.c
@@ -37,9 +37,13 @@ __if_nametoindex (const char *ifname)
   if (fd < 0)
     return 0;
 
-  strncpy (ifr.ifr_name, ifname, IFNAMSIZ - 1);
-  ifr.ifr_name[IFNAMESIZ - 1] = '\0';
+  if (strlen (ifname) >= IFNAMSIZ)
+    {
+      __set_errno (ENODEV);
+      return 0;
+    }
 
+  strncpy (ifr.ifr_name, ifname, IFNAMESIZ - 1);
   if (__ioctl (fd, SIOCGIFINDEX, &ifr) < 0)
     {
       int saved_errno = errno;