From patchwork Mon Jan 2 16:07:09 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gustavo Zacarias X-Patchwork-Id: 710222 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from fraxinus.osuosl.org (smtp4.osuosl.org [140.211.166.137]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3tshmd4bDPz9sQw for ; Tue, 3 Jan 2017 03:07:29 +1100 (AEDT) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=zacarias.com.ar header.i=@zacarias.com.ar header.b="X0dQ0Gs9"; dkim-atps=neutral Received: from localhost (localhost [127.0.0.1]) by fraxinus.osuosl.org (Postfix) with ESMTP id 60C788505A; Mon, 2 Jan 2017 16:07:27 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from fraxinus.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id yOxot4T1Pnwz; Mon, 2 Jan 2017 16:07:25 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by fraxinus.osuosl.org (Postfix) with ESMTP id 457D784F98; Mon, 2 Jan 2017 16:07:25 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from whitealder.osuosl.org (smtp1.osuosl.org [140.211.166.138]) by ash.osuosl.org (Postfix) with ESMTP id 14DA51BFFF2 for ; Mon, 2 Jan 2017 16:07:24 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id 12BA58363B for ; Mon, 2 Jan 2017 16:07:24 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from whitealder.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id BUxre2bFLJZH for ; Mon, 2 Jan 2017 16:07:19 +0000 (UTC) X-Greylist: from auto-whitelisted by SQLgrey-1.7.6 Received: from www.zacarias.com.ar (www.zacarias.com.ar [176.9.42.171]) by whitealder.osuosl.org (Postfix) with ESMTPS id 7F2F483768 for ; Mon, 2 Jan 2017 16:07:16 +0000 (UTC) Received: from asgard (cpe-190-55-196-87.telecentro-reversos.com.ar [190.55.196.87] (may be forged)) (authenticated bits=0) by www.zacarias.com.ar (8.15.2/8.15.2) with ESMTPSA id v02G7APM012195 (version=TLSv1.2 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=NO); Mon, 2 Jan 2017 16:07:13 GMT DMARC-Filter: OpenDMARC Filter v1.3.1 www.zacarias.com.ar v02G7APM012195 Authentication-Results: zacarias.com.ar; dmarc=fail header.from=zacarias.com.ar Authentication-Results: zacarias.com.ar; spf=pass smtp.mailfrom=gustavo@zacarias.com.ar DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=zacarias.com.ar; s=dkey; t=1483373235; bh=CUpbuxZECozS8xVE0bWeXEwoFFcylDT/Ltdw1bEdP2g=; h=From:To:Cc:Subject:Date; b=X0dQ0Gs9zVteudDuigT1YzP72iVTxnKmwvc785UVAiyOYgi41WKYu55Ee/M/8orBi 6v5BKM+j0XcTHaQchbQ+qjHrDfEhmpPVh8nEcNIfvTTCdY0mYNyhMzVgdIHJQJMfkD h1hLhZ4fauooswg0nf5v4RZWsg/JHI63PEik7RsQ= Received: by asgard (sSMTP sendmail emulation); Mon, 02 Jan 2017 13:07:09 -0300 From: Gustavo Zacarias To: buildroot@busybox.net Date: Mon, 2 Jan 2017 13:07:09 -0300 Message-Id: <20170102160709.27925-1-gustavo@zacarias.com.ar> X-Mailer: git-send-email 2.10.2 X-Virus-Scanned: clamav-milter 0.99 at www X-Virus-Status: Clean Subject: [Buildroot] [PATCH v2] musl: security bump to version 1.1.16 X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" Fixes: CVE-2016-8859 - fixes a serious under-allocation bug in regexec due to integer overflow. Drop upstream patch. Signed-off-by: Gustavo Zacarias --- ....h.patch => 0001-avoid-kernel-if_ether.h.patch} | 0 ...regression-in-tcsetattr-on-all-mips-archs.patch | 67 ---------------------- package/musl/musl.hash | 2 +- package/musl/musl.mk | 2 +- 4 files changed, 2 insertions(+), 69 deletions(-) rename package/musl/{0002-avoid-kernel-if_ether.h.patch => 0001-avoid-kernel-if_ether.h.patch} (100%) delete mode 100644 package/musl/0001-fix-regression-in-tcsetattr-on-all-mips-archs.patch diff --git a/package/musl/0002-avoid-kernel-if_ether.h.patch b/package/musl/0001-avoid-kernel-if_ether.h.patch similarity index 100% rename from package/musl/0002-avoid-kernel-if_ether.h.patch rename to package/musl/0001-avoid-kernel-if_ether.h.patch diff --git a/package/musl/0001-fix-regression-in-tcsetattr-on-all-mips-archs.patch b/package/musl/0001-fix-regression-in-tcsetattr-on-all-mips-archs.patch deleted file mode 100644 index 73ccae4..0000000 --- a/package/musl/0001-fix-regression-in-tcsetattr-on-all-mips-archs.patch +++ /dev/null @@ -1,67 +0,0 @@ -From cff5747c74c41b22f1ce1340978b1c226a8cdf32 Mon Sep 17 00:00:00 2001 -From: Rich Felker -Date: Wed, 13 Jul 2016 15:04:30 -0400 -Subject: [PATCH] fix regression in tcsetattr on all mips archs - -revert commit 8c316e9e49d37ad92c2e7493e16166a2afca419f. it was wrong -and does not match how the kernel API works. - -Signed-off-by: Rich Felker -Signed-off-by: Waldemar Brodkorb ---- - arch/mips/bits/termios.h | 6 +++--- - arch/mips64/bits/termios.h | 6 +++--- - arch/mipsn32/bits/termios.h | 6 +++--- - 3 files changed, 9 insertions(+), 9 deletions(-) - -diff --git a/arch/mips/bits/termios.h b/arch/mips/bits/termios.h -index f559f76..6a1205d 100644 ---- a/arch/mips/bits/termios.h -+++ b/arch/mips/bits/termios.h -@@ -141,9 +141,9 @@ struct termios { - #define TCOFLUSH 1 - #define TCIOFLUSH 2 - --#define TCSANOW 0x540e --#define TCSADRAIN 0x540f --#define TCSAFLUSH 0x5410 -+#define TCSANOW 0 -+#define TCSADRAIN 1 -+#define TCSAFLUSH 2 - - #if defined(_GNU_SOURCE) || defined(_BSD_SOURCE) - #define EXTA 0000016 -diff --git a/arch/mips64/bits/termios.h b/arch/mips64/bits/termios.h -index f559f76..6a1205d 100644 ---- a/arch/mips64/bits/termios.h -+++ b/arch/mips64/bits/termios.h -@@ -141,9 +141,9 @@ struct termios { - #define TCOFLUSH 1 - #define TCIOFLUSH 2 - --#define TCSANOW 0x540e --#define TCSADRAIN 0x540f --#define TCSAFLUSH 0x5410 -+#define TCSANOW 0 -+#define TCSADRAIN 1 -+#define TCSAFLUSH 2 - - #if defined(_GNU_SOURCE) || defined(_BSD_SOURCE) - #define EXTA 0000016 -diff --git a/arch/mipsn32/bits/termios.h b/arch/mipsn32/bits/termios.h -index f559f76..6a1205d 100644 ---- a/arch/mipsn32/bits/termios.h -+++ b/arch/mipsn32/bits/termios.h -@@ -141,9 +141,9 @@ struct termios { - #define TCOFLUSH 1 - #define TCIOFLUSH 2 - --#define TCSANOW 0x540e --#define TCSADRAIN 0x540f --#define TCSAFLUSH 0x5410 -+#define TCSANOW 0 -+#define TCSADRAIN 1 -+#define TCSAFLUSH 2 - - #if defined(_GNU_SOURCE) || defined(_BSD_SOURCE) - #define EXTA 0000016 diff --git a/package/musl/musl.hash b/package/musl/musl.hash index 8ef4def..f3f3741 100644 --- a/package/musl/musl.hash +++ b/package/musl/musl.hash @@ -1,2 +1,2 @@ # Locally calculated after checking pgp signature -sha256 97e447c7ee2a7f613186ec54a93054fe15469fe34d7d323080f7ef38f5ecb0fa musl-1.1.15.tar.gz +sha256 937185a5e5d721050306cf106507a006c3f1f86d86cd550024ea7be909071011 musl-1.1.16.tar.gz diff --git a/package/musl/musl.mk b/package/musl/musl.mk index ea1ce6d..6d56033 100644 --- a/package/musl/musl.mk +++ b/package/musl/musl.mk @@ -4,7 +4,7 @@ # ################################################################################ -MUSL_VERSION = 1.1.15 +MUSL_VERSION = 1.1.16 MUSL_SITE = http://www.musl-libc.org/releases MUSL_LICENSE = MIT MUSL_LICENSE_FILES = COPYRIGHT