From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 60422 invoked by alias); 3 Apr 2018 16:08:25 -0000 Mailing-List: contact libc-alpha-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Subscribe: List-Archive: List-Post: List-Help: , Sender: libc-alpha-owner@sourceware.org Received: (qmail 60293 invoked by uid 89); 3 Apr 2018 16:08:24 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-26.1 required=5.0 tests=BAYES_00,GIT_PATCH_0,GIT_PATCH_1,GIT_PATCH_2,GIT_PATCH_3,SPF_HELO_PASS,SPF_NEUTRAL autolearn=ham version=3.3.2 spammy= X-HELO: hera.aquilenet.fr From: Samuel Thibault To: libc-alpha@sourceware.org Cc: Samuel Thibault Subject: [hurd,commited] hurd: Fix buffer overrun in __if_nametoindex Date: Tue, 03 Apr 2018 16:08:00 -0000 Message-Id: <20180403160818.4652-1-samuel.thibault@ens-lyon.org> X-SW-Source: 2018-04/txt/msg00063.txt.bz2 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. --- ChangeLog | 5 +++++ sysdeps/mach/hurd/if_index.c | 4 +++- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 36b022cb35..28fa4a5e69 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2018-04-03 Samuel Thibault + + * sysdeps/mach/hurd/if_index.c (__if_nametoindex): Always end + ifr.fr_name with a NUL caracter. + 2018-04-03 Wilco Dijkstra * 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 d637353d74..7f647b7036 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; -- 2.16.2