From: Samuel Thibault <samuel.thibault@ens-lyon.org>
To: libc-alpha@sourceware.org
Cc: Samuel Thibault <samuel.thibault@ens-lyon.org>
Subject: [hurd,commited] hurd: Make __if_nametoindex return ENODEV if ifname is too long
Date: Tue, 03 Apr 2018 21:15:00 -0000 [thread overview]
Message-ID: <20180403211458.12717-1-samuel.thibault@ens-lyon.org> (raw)
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
next reply other threads:[~2018-04-03 21:15 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-04-03 21:15 Samuel Thibault [this message]
2018-04-03 21:25 ` Andreas Schwab
2018-04-03 22:03 ` Samuel Thibault
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20180403211458.12717-1-samuel.thibault@ens-lyon.org \
--to=samuel.thibault@ens-lyon.org \
--cc=libc-alpha@sourceware.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
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).