From patchwork Sun Feb 7 10:28:21 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Vincent Legoll X-Patchwork-Id: 26941 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id C728227BC21; Sun, 7 Feb 2021 10:29:39 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.8 required=5.0 tests=BAYES_00,DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H4, RCVD_IN_MSPIKE_WL,SPF_HELO_PASS,T_DKIM_INVALID,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.2 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 6839427BC1E for ; Sun, 7 Feb 2021 10:29:38 +0000 (GMT) Received: from localhost ([::1]:38808 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1l8hJx-0007aY-Et for patchwork@mira.cbaines.net; Sun, 07 Feb 2021 05:29:37 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:34726) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1l8hJO-0007aB-CE for guix-patches@gnu.org; Sun, 07 Feb 2021 05:29:02 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:35374) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1l8hJO-0004AL-5I for guix-patches@gnu.org; Sun, 07 Feb 2021 05:29:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1l8hJN-00041O-WF for guix-patches@gnu.org; Sun, 07 Feb 2021 05:29:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#46356] [PATCH] gnu: vorbis-tools: Update to 1.4.2. Resent-From: Vincent Legoll Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 07 Feb 2021 10:29:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 46356 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 46356@debbugs.gnu.org Cc: Vincent Legoll X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.161269372515432 (code B ref -1); Sun, 07 Feb 2021 10:29:01 +0000 Received: (at submit) by debbugs.gnu.org; 7 Feb 2021 10:28:45 +0000 Received: from localhost ([127.0.0.1]:46920 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1l8hJ7-00040p-1Y for submit@debbugs.gnu.org; Sun, 07 Feb 2021 05:28:45 -0500 Received: from lists.gnu.org ([209.51.188.17]:32942) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1l8hJ2-00040d-Lq for submit@debbugs.gnu.org; Sun, 07 Feb 2021 05:28:43 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:34676) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1l8hJ1-0007ZZ-5E for guix-patches@gnu.org; Sun, 07 Feb 2021 05:28:40 -0500 Received: from mail-wm1-x32e.google.com ([2a00:1450:4864:20::32e]:50624) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1l8hIw-0003xv-EY for guix-patches@gnu.org; Sun, 07 Feb 2021 05:28:38 -0500 Received: by mail-wm1-x32e.google.com with SMTP id 190so10009879wmz.0 for ; Sun, 07 Feb 2021 02:28:33 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=84jue7J+vs5hCj34KLTbwPToJA6mSK234MLxf0xmumo=; b=Qa2iG4t6zZ/kYLPOw8sEN8sArfKhfHeR2xTOPl8YGjb0enUTN1xqpnv3aSrLgeMYok wTICX1YqYuQNtTI4A2me21+4ej4S9BQfJ52DEFhyVZTxSibhoER7m6nJC8o750M1KOrs U+7ztl2uOAE90lEjObRP8Nn06E4digocFWwk3YWnBo6INExxNXQRQuwjOGrQG3MUGCSn 7duXVe2DZ/6e33MYahQwA/IWm2Q+r/hZ3ACsOTHSNuBgHQ8XKYU3EiSUkOPywBiQ5zPp tK2ZdEzxnewDP2/1bOg0k+D5YLWFZhJpgeP8ToW6JpcjEB9INFnnFmOHbVK3ed4X2U3U G9rQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=84jue7J+vs5hCj34KLTbwPToJA6mSK234MLxf0xmumo=; b=eWOlIVd5pytyYlr2pdQRuXGzDv58ZQ5OCMilQVsR9dDDgqkhkblwnIyroXdOfpvWKU Oq3SUMWpYEYHhXGQu0XAdLUu/3D8nrr84tsNSJFedvs8gyDY/AzDFtZeIhZgYt+FvQ9T fH2we0cZB0mcPnP/mzVWEgPt2WBzPBPairiX1X+kD9k8rFAvk7MNA/DhPRPkLTFcKHHE H0M8NefCyzFQ2u+FKEqxHtPfgDg+rfOckQ26ig69Thv+JE5z7kUjIec3nxSEndcP//8l V1dZiAO4eEYrDl9juyazi+Gi7K3exqkvksduaaosEZfm8MZ8JrSwPiCNRYMKQWIaUTya oUoQ== X-Gm-Message-State: AOAM531qgfVBDRauDn7poDyYaGvB3MsdR1q0W55ucHrCWlEUbJFt978o WopXnhfzB5ASR5MRci1rdxeJM74TIO0= X-Google-Smtp-Source: ABdhPJw0VqPs08PTmY/+hl7b1mytNMZhTKpINoNOoPoBbsK+sI0oOOcu7uXHKLz7kle4MbM+/oWE2A== X-Received: by 2002:a1c:8152:: with SMTP id c79mr10394079wmd.121.1612693712705; Sun, 07 Feb 2021 02:28:32 -0800 (PST) Received: from localhost.localdomain ([88.163.74.64]) by smtp.gmail.com with ESMTPSA id l11sm20066118wrt.23.2021.02.07.02.28.30 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 07 Feb 2021 02:28:31 -0800 (PST) From: Vincent Legoll Date: Sun, 7 Feb 2021 11:28:21 +0100 Message-Id: <20210207102821.7512-1-vincent.legoll@gmail.com> X-Mailer: git-send-email 2.30.0 MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::32e; envelope-from=vincent.legoll@gmail.com; helo=mail-wm1-x32e.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FROM=0.001, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches * gnu/packages/xiph.scm (vorbis-tools): Update to 1.4.2. (source): Remove upstreamed patches... * gnu/local.mk (dist_patch_DATA): ...from here. * gnu/packages/patches/vorbis-tools-CVE-2014-9638+CVE-2014-9639.patch: remove file. * gnu/packages/patches/vorbis-tools-CVE-2014-9640.patch: remove file. * gnu/packages/patches/vorbis-tools-CVE-2015-6749.patch: remove file. --- gnu/local.mk | 3 - ...is-tools-CVE-2014-9638+CVE-2014-9639.patch | 83 ------------------- .../patches/vorbis-tools-CVE-2014-9640.patch | 29 ------- .../patches/vorbis-tools-CVE-2015-6749.patch | 44 ---------- gnu/packages/xiph.scm | 8 +- 5 files changed, 2 insertions(+), 165 deletions(-) delete mode 100644 gnu/packages/patches/vorbis-tools-CVE-2014-9638+CVE-2014-9639.patch delete mode 100644 gnu/packages/patches/vorbis-tools-CVE-2014-9640.patch delete mode 100644 gnu/packages/patches/vorbis-tools-CVE-2015-6749.patch diff --git a/gnu/local.mk b/gnu/local.mk index b9b4b664e4..fec9debfda 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1716,9 +1716,6 @@ dist_patch_DATA = \ %D%/packages/patches/vinagre-newer-freerdp.patch \ %D%/packages/patches/vinagre-newer-rdp-parameters.patch \ %D%/packages/patches/virglrenderer-CVE-2017-6386.patch \ - %D%/packages/patches/vorbis-tools-CVE-2014-9638+CVE-2014-9639.patch \ - %D%/packages/patches/vorbis-tools-CVE-2014-9640.patch \ - %D%/packages/patches/vorbis-tools-CVE-2015-6749.patch \ %D%/packages/patches/vsearch-unbundle-cityhash.patch \ %D%/packages/patches/vte-CVE-2012-2738-pt1.patch \ %D%/packages/patches/vte-CVE-2012-2738-pt2.patch \ diff --git a/gnu/packages/patches/vorbis-tools-CVE-2014-9638+CVE-2014-9639.patch b/gnu/packages/patches/vorbis-tools-CVE-2014-9638+CVE-2014-9639.patch deleted file mode 100644 index 6e389dd59e..0000000000 --- a/gnu/packages/patches/vorbis-tools-CVE-2014-9638+CVE-2014-9639.patch +++ /dev/null @@ -1,83 +0,0 @@ -From: Petter Reinholdtsen -Date: Tue, 22 Sep 2015 15:14:06 +0200 -Subject: oggenc: validate count of channels in the header (CVE-2014-9638 & - CVE-2014-9639) - -Author: Kamil Dudka -Origin: http://lists.xiph.org/pipermail/vorbis-dev/2015-February/020423.html -Bug: https://trac.xiph.org/ticket/2136 -Bug: https://trac.xiph.org/ticket/2137 -Bug-Debian: https://bugs.debian.org/776086 -Forwarded: not-needed -Reviewed-By: Petter Reinholdtsen -Last-Update: 2015-09-22 ---- - oggenc/audio.c | 18 ++++++++++++++++-- - 1 file changed, 16 insertions(+), 2 deletions(-) - -diff --git a/oggenc/audio.c b/oggenc/audio.c -index 05e42b3..1b3f179 100644 ---- a/oggenc/audio.c -+++ b/oggenc/audio.c -@@ -13,6 +13,7 @@ - #include - #endif - -+#include - #include - #include - #include -@@ -251,6 +252,7 @@ int aiff_open(FILE *in, oe_enc_opt *opt, unsigned char *buf, int buflen) - aiff_fmt format; - aifffile *aiff = malloc(sizeof(aifffile)); - int i; -+ long channels; - - if(buf[11]=='C') - aifc=1; -@@ -277,11 +279,16 @@ int aiff_open(FILE *in, oe_enc_opt *opt, unsigned char *buf, int buflen) - return 0; - } - -- format.channels = READ_U16_BE(buffer); -+ format.channels = channels = READ_U16_BE(buffer); - format.totalframes = READ_U32_BE(buffer+2); - format.samplesize = READ_U16_BE(buffer+6); - format.rate = (int)read_IEEE80(buffer+8); - -+ if(channels <= 0L || SHRT_MAX < channels) -+ { -+ fprintf(stderr, _("Warning: Unsupported count of channels in AIFF header\n")); -+ return 0; -+ } - aiff->bigendian = 1; - - if(aifc) -@@ -412,6 +419,7 @@ int wav_open(FILE *in, oe_enc_opt *opt, unsigned char *oldbuf, int buflen) - wav_fmt format; - wavfile *wav = malloc(sizeof(wavfile)); - int i; -+ long channels; - - /* Ok. At this point, we know we have a WAV file. Now we have to detect - * whether we support the subtype, and we have to find the actual data -@@ -449,12 +457,18 @@ int wav_open(FILE *in, oe_enc_opt *opt, unsigned char *oldbuf, int buflen) - } - - format.format = READ_U16_LE(buf); -- format.channels = READ_U16_LE(buf+2); -+ format.channels = channels = READ_U16_LE(buf+2); - format.samplerate = READ_U32_LE(buf+4); - format.bytespersec = READ_U32_LE(buf+8); - format.align = READ_U16_LE(buf+12); - format.samplesize = READ_U16_LE(buf+14); - -+ if(channels <= 0L || SHRT_MAX < channels) -+ { -+ fprintf(stderr, _("Warning: Unsupported count of channels in WAV header\n")); -+ return 0; -+ } -+ - if(format.format == -2) /* WAVE_FORMAT_EXTENSIBLE */ - { - if(len<40) diff --git a/gnu/packages/patches/vorbis-tools-CVE-2014-9640.patch b/gnu/packages/patches/vorbis-tools-CVE-2014-9640.patch deleted file mode 100644 index 97d18e0db7..0000000000 --- a/gnu/packages/patches/vorbis-tools-CVE-2014-9640.patch +++ /dev/null @@ -1,29 +0,0 @@ -Index: vorbis-tools/oggenc/oggenc.c -=================================================================== ---- vorbis-tools/oggenc/oggenc.c (revision 19116) -+++ vorbis-tools/oggenc/oggenc.c (revision 19117) -@@ -98,4 +98,6 @@ - 0,0,0.f, - 0, 0, 0, 0, 0}; -+ input_format raw_format = {NULL, 0, raw_open, wav_close, "raw", -+ N_("RAW file reader")}; - - int i; -@@ -240,6 +242,4 @@ - if(opt.rawmode) - { -- input_format raw_format = {NULL, 0, raw_open, wav_close, "raw", -- N_("RAW file reader")}; - - enc_opts.rate=opt.raw_samplerate; -Index: vorbis-tools/oggenc/skeleton.h -=================================================================== ---- vorbis-tools/oggenc/skeleton.h (revision 19116) -+++ vorbis-tools/oggenc/skeleton.h (revision 19117) -@@ -42,5 +42,5 @@ - ogg_int64_t start_granule; /* start granule value */ - ogg_uint32_t preroll; /* preroll */ -- unsigned char granule_shift; // a 8-bit field /* 1 byte value holding the granule shift */ -+ unsigned char granule_shift; /* 1 byte value holding the granule shift */ - char *message_header_fields; /* holds all the message header fields */ - /* current total size of the message header fields, for realloc purpose, initially zero */ diff --git a/gnu/packages/patches/vorbis-tools-CVE-2015-6749.patch b/gnu/packages/patches/vorbis-tools-CVE-2015-6749.patch deleted file mode 100644 index bcddcbfd70..0000000000 --- a/gnu/packages/patches/vorbis-tools-CVE-2015-6749.patch +++ /dev/null @@ -1,44 +0,0 @@ -Upstream fix for CVE-2015-6749. -https://trac.xiph.org/ticket/2212 - -From 04815d3e1bfae3a6cdfb2c25358a5a72b61299f7 Mon Sep 17 00:00:00 2001 -From: Mark Harris -Date: Sun, 30 Aug 2015 05:54:46 -0700 -Subject: [PATCH] oggenc: Fix large alloca on bad AIFF input - -Fixes #2212 ---- - oggenc/audio.c | 10 +++++----- - 1 file changed, 5 insertions(+), 5 deletions(-) - -diff --git a/oggenc/audio.c b/oggenc/audio.c -index 477da8c..4921fb9 100644 ---- a/oggenc/audio.c -+++ b/oggenc/audio.c -@@ -245,8 +245,8 @@ static int aiff_permute_matrix[6][6] = - int aiff_open(FILE *in, oe_enc_opt *opt, unsigned char *buf, int buflen) - { - int aifc; /* AIFC or AIFF? */ -- unsigned int len; -- unsigned char *buffer; -+ unsigned int len, readlen; -+ unsigned char buffer[22]; - unsigned char buf2[8]; - aiff_fmt format; - aifffile *aiff = malloc(sizeof(aifffile)); -@@ -269,9 +269,9 @@ int aiff_open(FILE *in, oe_enc_opt *opt, unsigned char *buf, int buflen) - return 0; /* Weird common chunk */ - } - -- buffer = alloca(len); -- -- if(fread(buffer,1,len,in) < len) -+ readlen = len < sizeof(buffer) ? len : sizeof(buffer); -+ if(fread(buffer,1,readlen,in) < readlen || -+ (len > readlen && !seek_forward(in, len-readlen))) - { - fprintf(stderr, _("Warning: Unexpected EOF in reading AIFF header\n")); - return 0; --- -2.5.0 - diff --git a/gnu/packages/xiph.scm b/gnu/packages/xiph.scm index 4a3f25e009..8ed0e518a7 100644 --- a/gnu/packages/xiph.scm +++ b/gnu/packages/xiph.scm @@ -312,18 +312,14 @@ Kate stream.") (define vorbis-tools (package (name "vorbis-tools") - (version "1.4.0") + (version "1.4.2") (source (origin (method url-fetch) (uri (string-append "https://downloads.xiph.org/releases/vorbis/" "vorbis-tools-" version ".tar.gz")) (sha256 (base32 - "1g12bnh5ah08v529y72kfdz5lhvy75iaz7f9jskyby23m9dkk2d3")) - (patches (search-patches - "vorbis-tools-CVE-2014-9638+CVE-2014-9639.patch" - "vorbis-tools-CVE-2014-9640.patch" - "vorbis-tools-CVE-2015-6749.patch")))) + "1c7h4ivgfdyygz2hyh6nfibxlkz8kdk868a576qkkjgj5gn78xyv")))) (build-system gnu-build-system) (inputs `(("ao" ,ao) ("curl" ,curl)