From 63a1a62dfe20fc532dc155dee4e7790754b95445 Mon Sep 17 00:00:00 2001
From: Kamil Dudka <kdudka@redhat.com>
Date: Thu, 19 Feb 2015 15:40:10 +0100
Subject: [PATCH] validate count of channels in the header (CVE-2014-9638 and
 CVE-2014-9639)

---
 ...ls-1.4.0-CVE-2014-9638-CVE-2014-9639.patch | 84 +++++++++++++++++++
 vorbis-tools.spec                             | 12 ++-
 2 files changed, 95 insertions(+), 1 deletion(-)
 create mode 100644 vorbis-tools-1.4.0-CVE-2014-9638-CVE-2014-9639.patch

diff --git a/vorbis-tools-1.4.0-CVE-2014-9638-CVE-2014-9639.patch b/vorbis-tools-1.4.0-CVE-2014-9638-CVE-2014-9639.patch
new file mode 100644
index 0000000..0ae0929
--- /dev/null
+++ b/vorbis-tools-1.4.0-CVE-2014-9638-CVE-2014-9639.patch
@@ -0,0 +1,84 @@
+From 32c4958c4d113562f879ce76664fe785f93bba7c Mon Sep 17 00:00:00 2001
+From: Kamil Dudka <kdudka@redhat.com>
+Date: Thu, 19 Feb 2015 15:32:24 +0100
+Subject: [PATCH] oggenc: validate count of channels in the header
+
+... 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 22bbed4..1cbb214 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)
+@@ -412,6 +420,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 +458,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)
+-- 
+2.1.0
+
diff --git a/vorbis-tools.spec b/vorbis-tools.spec
index b73c8be..0f36f91 100644
--- a/vorbis-tools.spec
+++ b/vorbis-tools.spec
@@ -1,7 +1,7 @@
 Summary:	The Vorbis General Audio Compression Codec tools
 Name:		vorbis-tools
 Version:	1.4.0
-Release:	18%{?dist}
+Release:	19%{?dist}
 Epoch:		1
 Group:		Applications/Multimedia
 License:	GPLv2
@@ -21,6 +21,9 @@ Patch3:		vorbis-tools-1.4.0-bz1116650.patch
 # do not use stack variable out of its scope of validity (#1185558)
 Patch4:		vorbis-tools-1.4.0-bz1185558.patch
 
+# validate count of channels in the header (CVE-2014-9638 and CVE-2014-9639)
+Patch5:		vorbis-tools-1.4.0-CVE-2014-9638-CVE-2014-9639.patch
+
 BuildRequires:	flac-devel
 BuildRequires:	gettext
 BuildRequires:	libao-devel
@@ -46,12 +49,16 @@ comment editor.
 %patch2 -p1
 %patch3 -p1
 %patch4 -p1
+%patch5 -p1
 
 
 %build
 # fix FTBFS if "-Werror=format-security" flag is used (#1025257)
 export CFLAGS="$RPM_OPT_FLAGS -Wno-error=format-security"
 
+# uncomment this when debugging
+#CFLAGS="$CFLAGS -O0"
+
 %configure
 make %{?_smp_mflags}
 make %{?_smp_mflags} update-gmo -C po
@@ -70,6 +77,9 @@ rm -rf $RPM_BUILD_ROOT%{_docdir}/%{name}*
 
 
 %changelog
+* Thu Feb 19 2015 Kamil Dudka <kdudka@redhat.com> - 1:1.4.0-19
+- validate count of channels in the header (CVE-2014-9638 and CVE-2014-9639)
+
 * Mon Jan 26 2015 Kamil Dudka <kdudka@redhat.com> - 1:1.4.0-18
 - do not use stack variable out of its scope of validity (#1185558)