From patchwork Tue Apr 3 16:08:18 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Samuel Thibault X-Patchwork-Id: 894683 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=sourceware.org (client-ip=209.132.180.131; helo=sourceware.org; envelope-from=libc-alpha-return-91368-incoming=patchwork.ozlabs.org@sourceware.org; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=ens-lyon.org Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; secure) header.d=sourceware.org header.i=@sourceware.org header.b="WXRlf8KH"; dkim-atps=neutral Received: from sourceware.org (server1.sourceware.org [209.132.180.131]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 40FvCh45cTz9s1p for ; Wed, 4 Apr 2018 02:08:48 +1000 (AEST) DomainKey-Signature: a=rsa-sha1; c=nofws; d=sourceware.org; h=list-id :list-unsubscribe:list-subscribe:list-archive:list-post :list-help:sender:from:to:cc:subject:date:message-id; q=dns; s= default; b=dvBxvOyqH1n7PwwnW9ynb8ui3DjJtMJcGaP3Fortp+pqb2M1zz3ho Vz8CVGn0Ve0rrJggnnMq0Jlz+RyWtFO2//WQGiHjcjiuGyh1tWBXJ248X2ArSF4n vpSH2Q5uBh2asywGP72Ix+bwozrXEUj3VgpCn0Ll9qOz7yJk9yehKo= DKIM-Signature: v=1; a=rsa-sha1; c=relaxed; d=sourceware.org; h=list-id :list-unsubscribe:list-subscribe:list-archive:list-post :list-help:sender:from:to:cc:subject:date:message-id; s=default; bh=/8rL/85q7+d7ZkI5htz1ONLkoRY=; b=WXRlf8KHuRKTESJFpxTtjSo2lBQw 4tD7rRo29eFUYsNm8udmxvtlgn74Ctsei+DJ1BVp9XX60FUmpXLlvMDVTac3QYB0 G5rbfHWAfK2BL3V7lFi4sajwCs1urvOcjV4raps/6ge9wWlHglfaamQ1EKdqnRPC H2z1nGYCFE5CQm8= 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-Unsubscribe: List-Subscribe: List-Archive: List-Post: List-Help: , Sender: libc-alpha-owner@sourceware.org Delivered-To: mailing list libc-alpha@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, 3 Apr 2018 18:08:18 +0200 Message-Id: <20180403160818.4652-1-samuel.thibault@ens-lyon.org> 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;