[arch-commits] Commit in vorbis-tools/trunk (8 files)
Christian Hesse
eworm at archlinux.org
Tue Oct 2 22:29:12 UTC 2018
Date: Tuesday, October 2, 2018 @ 22:29:12
Author: eworm
Revision: 335656
upgpkg: vorbis-tools 1.4.0-8
fix segfault in vcut (FS#51517)
Added:
vorbis-tools/trunk/0001-vorbis-tools-cve9638-cve9639.patch
vorbis-tools/trunk/0002-vorbis-tools-cve9640.patch
vorbis-tools/trunk/0003-vorbis-tools-CVE-2015-6749.patch
vorbis-tools/trunk/0004-fix-segfault-in-vcut.patch
Modified:
vorbis-tools/trunk/PKGBUILD
Deleted:
vorbis-tools/trunk/vorbis-tools-CVE-2015-6749.patch
vorbis-tools/trunk/vorbis-tools-cve9638-cve9639.patch
vorbis-tools/trunk/vorbis-tools-cve9640.patch
-----------------------------------------+
0001-vorbis-tools-cve9638-cve9639.patch | 77 ++++++++++++++++++++++++++++++
0002-vorbis-tools-cve9640.patch | 29 +++++++++++
0003-vorbis-tools-CVE-2015-6749.patch | 41 +++++++++++++++
0004-fix-segfault-in-vcut.patch | 25 +++++++++
PKGBUILD | 21 ++++----
vorbis-tools-CVE-2015-6749.patch | 41 ---------------
vorbis-tools-cve9638-cve9639.patch | 77 ------------------------------
vorbis-tools-cve9640.patch | 29 -----------
8 files changed, 184 insertions(+), 156 deletions(-)
Added: 0001-vorbis-tools-cve9638-cve9639.patch
===================================================================
--- 0001-vorbis-tools-cve9638-cve9639.patch (rev 0)
+++ 0001-vorbis-tools-cve9638-cve9639.patch 2018-10-02 22:29:12 UTC (rev 335656)
@@ -0,0 +1,77 @@
+... in order to prevent a division by zero (CVE-2014-9638) and integer
+overflow (CVE-2014-9639).
+
+Bug: https://trac.xiph.org/ticket/2136
+Bug: https://trac.xiph.org/ticket/2137
+---
+ oggenc/audio.c | 19 +++++++++++++++++--
+ 1 file changed, 17 insertions(+), 2 deletions(-)
+
+diff --git a/oggenc/audio.c b/oggenc/audio.c
+index 477da8c..1167f1b 100644
+--- a/oggenc/audio.c
++++ b/oggenc/audio.c
+@@ -13,6 +13,7 @@
+ #include <config.h>
+ #endif
+
++#include <limits.h>
+ #include <stdlib.h>
+ #include <stdio.h>
+ #include <string.h>
+@@ -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,17 @@ 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)
+@@ -416,6 +424,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
+@@ -453,12 +462,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)
+--
Added: 0002-vorbis-tools-cve9640.patch
===================================================================
--- 0002-vorbis-tools-cve9640.patch (rev 0)
+++ 0002-vorbis-tools-cve9640.patch 2018-10-02 22:29:12 UTC (rev 335656)
@@ -0,0 +1,29 @@
+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 */
Added: 0003-vorbis-tools-CVE-2015-6749.patch
===================================================================
--- 0003-vorbis-tools-CVE-2015-6749.patch (rev 0)
+++ 0003-vorbis-tools-CVE-2015-6749.patch 2018-10-02 22:29:12 UTC (rev 335656)
@@ -0,0 +1,41 @@
+From 04815d3e1bfae3a6cdfb2c25358a5a72b61299f7 Mon Sep 17 00:00:00 2001
+From: Mark Harris <mark.hsj at gmail.com>
+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
+
Added: 0004-fix-segfault-in-vcut.patch
===================================================================
--- 0004-fix-segfault-in-vcut.patch (rev 0)
+++ 0004-fix-segfault-in-vcut.patch 2018-10-02 22:29:12 UTC (rev 335656)
@@ -0,0 +1,25 @@
+From: =?utf-8?q?Martin_Stegh=C3=B6fer?= <martin at steghoefer.eu>
+Date: Mon, 14 Mar 2016 20:22:12 +0100
+Subject: vcut: Fix segmentation fault because of out-of-range index in header
+ writing
+
+Bug-Debian: https://bugs.debian.org/818037
+Bug: https://trac.xiph.org/ticket/2264
+Forwarded: https://trac.xiph.org/ticket/2264
+---
+ vcut/vcut.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/vcut/vcut.c b/vcut/vcut.c
+index d7ba699..17426b9 100644
+--- a/vcut/vcut.c
++++ b/vcut/vcut.c
+@@ -178,7 +178,7 @@ static int submit_headers_to_stream(vcut_state *s)
+ for(i=0;i<4;i++)
+ {
+ ogg_packet p;
+- if(i < 4) /* a header packet */
++ if(i < 3) /* a header packet */
+ {
+ p.bytes = vs->headers[i].length;
+ p.packet = vs->headers[i].packet;
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2018-10-02 21:28:34 UTC (rev 335655)
+++ PKGBUILD 2018-10-02 22:29:12 UTC (rev 335656)
@@ -2,7 +2,7 @@
pkgname=vorbis-tools
pkgver=1.4.0
-pkgrel=7
+pkgrel=8
pkgdesc='Extra tools for Ogg-Vorbis'
arch=('x86_64')
url='https://www.xiph.org/vorbis/'
@@ -9,20 +9,23 @@
license=('GPL2')
depends=('libao' 'libvorbis' 'curl' 'flac')
source=("https://downloads.xiph.org/releases/vorbis/${pkgname}-${pkgver}.tar.gz"
- 'vorbis-tools-cve9638-cve9639.patch'
- 'vorbis-tools-cve9640.patch'
- 'vorbis-tools-CVE-2015-6749.patch')
+ '0001-vorbis-tools-cve9638-cve9639.patch'
+ '0002-vorbis-tools-cve9640.patch'
+ '0003-vorbis-tools-CVE-2015-6749.patch'
+ '0004-fix-segfault-in-vcut.patch')
sha256sums=('a389395baa43f8e5a796c99daf62397e435a7e73531c9f44d9084055a05d22bc'
'5a6d74de56e67613c4887e3fe9102aadfce4cd4a9a477fb2c1ed1a26f11fdff6'
- '903e159f141dcb7308a7070e58d4434b09e2a8d4f6b76ebf20751eda201127a9'
- '52f1d083c16b9caa2bc7bd5315210bac810dd6a0565e4c270650177a4c815fa7')
+ 'ac4dfaba96c1f324c79dd81c88386e62508114f24d1cadcce9be48a87e58980a'
+ '52f1d083c16b9caa2bc7bd5315210bac810dd6a0565e4c270650177a4c815fa7'
+ '747984e0091e5ed68c190e502f1e9b6871cda216f85f3e52879986a48973938b')
prepare() {
cd ${pkgname}-${pkgver}
- patch -p1 -i "${srcdir}/vorbis-tools-cve9638-cve9639.patch"
- patch -p3 -i "${srcdir}/vorbis-tools-cve9640.patch"
- patch -p1 -i "${srcdir}/vorbis-tools-CVE-2015-6749.patch"
+ patch -p1 -i "${srcdir}/0001-vorbis-tools-cve9638-cve9639.patch"
+ patch -p1 -i "${srcdir}/0002-vorbis-tools-cve9640.patch"
+ patch -p1 -i "${srcdir}/0003-vorbis-tools-CVE-2015-6749.patch"
+ patch -p1 -i "${srcdir}/0004-fix-segfault-in-vcut.patch"
}
build() {
Deleted: vorbis-tools-CVE-2015-6749.patch
===================================================================
--- vorbis-tools-CVE-2015-6749.patch 2018-10-02 21:28:34 UTC (rev 335655)
+++ vorbis-tools-CVE-2015-6749.patch 2018-10-02 22:29:12 UTC (rev 335656)
@@ -1,41 +0,0 @@
-From 04815d3e1bfae3a6cdfb2c25358a5a72b61299f7 Mon Sep 17 00:00:00 2001
-From: Mark Harris <mark.hsj at gmail.com>
-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
-
Deleted: vorbis-tools-cve9638-cve9639.patch
===================================================================
--- vorbis-tools-cve9638-cve9639.patch 2018-10-02 21:28:34 UTC (rev 335655)
+++ vorbis-tools-cve9638-cve9639.patch 2018-10-02 22:29:12 UTC (rev 335656)
@@ -1,77 +0,0 @@
-... in order to prevent a division by zero (CVE-2014-9638) and integer
-overflow (CVE-2014-9639).
-
-Bug: https://trac.xiph.org/ticket/2136
-Bug: https://trac.xiph.org/ticket/2137
----
- oggenc/audio.c | 19 +++++++++++++++++--
- 1 file changed, 17 insertions(+), 2 deletions(-)
-
-diff --git a/oggenc/audio.c b/oggenc/audio.c
-index 477da8c..1167f1b 100644
---- a/oggenc/audio.c
-+++ b/oggenc/audio.c
-@@ -13,6 +13,7 @@
- #include <config.h>
- #endif
-
-+#include <limits.h>
- #include <stdlib.h>
- #include <stdio.h>
- #include <string.h>
-@@ -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,17 @@ 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)
-@@ -416,6 +424,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
-@@ -453,12 +462,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)
---
Deleted: vorbis-tools-cve9640.patch
===================================================================
--- vorbis-tools-cve9640.patch 2018-10-02 21:28:34 UTC (rev 335655)
+++ vorbis-tools-cve9640.patch 2018-10-02 22:29:12 UTC (rev 335656)
@@ -1,29 +0,0 @@
-Index: /trunk/vorbis-tools/oggenc/oggenc.c
-===================================================================
---- /trunk/vorbis-tools/oggenc/oggenc.c (revision 19116)
-+++ /trunk/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: /trunk/vorbis-tools/oggenc/skeleton.h
-===================================================================
---- /trunk/vorbis-tools/oggenc/skeleton.h (revision 19116)
-+++ /trunk/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 */
More information about the arch-commits
mailing list