* [hurd,commited] hurd: Make __if_nametoindex return ENODEV if ifname is too long
@ 2018-04-03 21:15 Samuel Thibault
2018-04-03 21:25 ` Andreas Schwab
0 siblings, 1 reply; 3+ messages in thread
From: Samuel Thibault @ 2018-04-03 21:15 UTC (permalink / raw)
To: libc-alpha; +Cc: Samuel Thibault
rather than truncating it.
* sysdeps/mach/hurd/if_index.c (__if_nametoindex): Return ENODEV if
ifname is too long.
---
ChangeLog | 4 ++--
sysdeps/mach/hurd/if_index.c | 8 ++++++--
2 files changed, 8 insertions(+), 4 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index dd78bf691a..cc9613239d 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 7f647b7036..b56bfc7ecd 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;
--
2.16.2
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [hurd,commited] hurd: Make __if_nametoindex return ENODEV if ifname is too long
2018-04-03 21:15 [hurd,commited] hurd: Make __if_nametoindex return ENODEV if ifname is too long Samuel Thibault
@ 2018-04-03 21:25 ` Andreas Schwab
2018-04-03 22:03 ` Samuel Thibault
0 siblings, 1 reply; 3+ messages in thread
From: Andreas Schwab @ 2018-04-03 21:25 UTC (permalink / raw)
To: Samuel Thibault; +Cc: libc-alpha
On Apr 03 2018, Samuel Thibault <samuel.thibault@ens-lyon.org> wrote:
> + strncpy (ifr.ifr_name, ifname, IFNAMESIZ - 1);
That leaves ifr.ifr_name[IFNAMESIZ - 1] uninitialized.
Andreas.
--
Andreas Schwab, schwab@linux-m68k.org
GPG Key fingerprint = 58CA 54C7 6D53 942B 1756 01D3 44D5 214B 8276 4ED5
"And now for something completely different."
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [hurd,commited] hurd: Make __if_nametoindex return ENODEV if ifname is too long
2018-04-03 21:25 ` Andreas Schwab
@ 2018-04-03 22:03 ` Samuel Thibault
0 siblings, 0 replies; 3+ messages in thread
From: Samuel Thibault @ 2018-04-03 22:03 UTC (permalink / raw)
To: Andreas Schwab; +Cc: libc-alpha, bug-hurd
Andreas Schwab, on mar. 03 avril 2018 23:24:54 +0200, wrote:
> On Apr 03 2018, Samuel Thibault <samuel.thibault@ens-lyon.org> wrote:
> > + strncpy (ifr.ifr_name, ifname, IFNAMESIZ - 1);
>
> That leaves ifr.ifr_name[IFNAMESIZ - 1] uninitialized.
D'oh...
If I wasn't seemingly all alone actually working on patches for the Hurd
port, I'd tend to have more time to take care...
Thanks,
Samuel
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2018-04-03 22:03 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2018-04-03 21:15 [hurd,commited] hurd: Make __if_nametoindex return ENODEV if ifname is too long Samuel Thibault
2018-04-03 21:25 ` Andreas Schwab
2018-04-03 22:03 ` Samuel Thibault
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).