Hello community, here is the log from the commit of package wavpack for openSUSE:Factory checked in at 2018-02-21 14:10:03 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/wavpack (Old) and /work/SRC/openSUSE:Factory/.wavpack.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "wavpack" Wed Feb 21 14:10:03 2018 rev:25 rq:578288 version:5.1.0 Changes: -------- --- /work/SRC/openSUSE:Factory/wavpack/wavpack.changes 2017-11-16 13:59:58.519884592 +0100 +++ /work/SRC/openSUSE:Factory/.wavpack.new/wavpack.changes 2018-02-21 14:10:04.665200854 +0100 @@ -1,0 +2,19 @@ +Tue Feb 20 08:48:07 UTC 2018 - [email protected] + +- Added CVE-2018-7253.patch: Fixed a heap based buffer overread in + cli/dsdiff.c, which allowed remote attackers to cause DoS via + a specially crafted input file (CVE-2018-7253, bsc#1081692) + +- Added CVE-2018-7254.patch: Fixed a buffer overread in cli/caff.c, + which allowed remote attackers to cause DoS via a specially + crafted input file (CVE-2018-7254, bsc#1081693) + +------------------------------------------------------------------- +Mon Feb 19 16:27:30 UTC 2018 - [email protected] + +- Security fix [bsc#1079746, CVE-2018-6767] + * Crafted wav file can trigger a stack buffer overflow when + parsing the file + * Added wavpack-CVE-2018-6767.patch + +------------------------------------------------------------------- New: ---- CVE-2018-7253.patch CVE-2018-7254.patch wavpack-CVE-2018-6767.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ wavpack.spec ++++++ --- /var/tmp/diff_new_pack.3iC9hf/_old 2018-02-21 14:10:05.601167148 +0100 +++ /var/tmp/diff_new_pack.3iC9hf/_new 2018-02-21 14:10:05.605167005 +0100 @@ -1,7 +1,7 @@ # # spec file for package wavpack # -# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -26,6 +26,11 @@ Url: http://www.wavpack.com/ Source0: http://www.wavpack.com/%{name}-%{version}.tar.bz2 Source99: baselibs.conf +# PATCH-FIX-UPSTREAM bsc#1079746 CVE-2018-6767 Crafted wav file can trigger +# a stack buffer overflow when parsing the file +Patch0: wavpack-CVE-2018-6767.patch +Patch1: CVE-2018-7253.patch +Patch2: CVE-2018-7254.patch BuildRequires: libtool BuildRequires: pkgconfig @@ -69,6 +74,9 @@ %prep %setup -q +%patch0 -p1 +%patch1 -p1 +%patch2 -p1 %build autoreconf -fiv ++++++ CVE-2018-7253.patch ++++++ >From 36a24c7881427d2e1e4dc1cef58f19eee0d13aec Mon Sep 17 00:00:00 2001 From: David Bryant <[email protected]> Date: Sat, 10 Feb 2018 16:01:39 -0800 Subject: [PATCH] issue #28, do not overwrite heap on corrupt DSDIFF file Upstream: merged --- cli/dsdiff.c | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/cli/dsdiff.c b/cli/dsdiff.c index 410dc1c..c016df9 100644 --- a/cli/dsdiff.c +++ b/cli/dsdiff.c @@ -153,7 +153,17 @@ int ParseDsdiffHeaderConfig (FILE *infile, char *infilename, char *fourcc, Wavpa error_line ("dsdiff file version = 0x%08x", version); } else if (!strncmp (dff_chunk_header.ckID, "PROP", 4)) { - char *prop_chunk = malloc ((size_t) dff_chunk_header.ckDataSize); + char *prop_chunk; + + if (dff_chunk_header.ckDataSize < 4 || dff_chunk_header.ckDataSize > 1024) { + error_line ("%s is not a valid .DFF file!", infilename); + return WAVPACK_SOFT_ERROR; + } + + if (debug_logging_mode) + error_line ("got PROP chunk of %d bytes total", (int) dff_chunk_header.ckDataSize); + + prop_chunk = malloc ((size_t) dff_chunk_header.ckDataSize); if (!DoReadFile (infile, prop_chunk, (uint32_t) dff_chunk_header.ckDataSize, &bcount) || bcount != dff_chunk_header.ckDataSize) { ++++++ CVE-2018-7254.patch ++++++ >From 8e3fe45a7bac31d9a3b558ae0079e2d92a04799e Mon Sep 17 00:00:00 2001 From: David Bryant <[email protected]> Date: Sun, 11 Feb 2018 16:37:47 -0800 Subject: [PATCH] issue #28, fix buffer overflows and bad allocs on corrupt CAF files Upstream: merged --- cli/caff.c | 30 +++++++++++++++++++++++------- 1 file changed, 23 insertions(+), 7 deletions(-) diff --git a/cli/caff.c b/cli/caff.c index ae57c4b..6248a71 100644 --- a/cli/caff.c +++ b/cli/caff.c @@ -89,8 +89,8 @@ typedef struct #define CAFChannelDescriptionFormat "LLLLL" -static const char TMH_full [] = { 1,2,3,13,9,10,5,6,12,14,15,16,17,9,4,18,7,8,19,20,21 }; -static const char TMH_std [] = { 1,2,3,11,8,9,5,6,10,12,13,14,15,7,4,16 }; +static const char TMH_full [] = { 1,2,3,13,9,10,5,6,12,14,15,16,17,9,4,18,7,8,19,20,21,0 }; +static const char TMH_std [] = { 1,2,3,11,8,9,5,6,10,12,13,14,15,7,4,16,0 }; static struct { uint32_t mChannelLayoutTag; // Core Audio layout, 100 - 146 in high word, num channels in low word @@ -274,10 +274,19 @@ int ParseCaffHeaderConfig (FILE *infile, char *infilename, char *fourcc, Wavpack } } else if (!strncmp (caf_chunk_header.mChunkType, "chan", 4)) { - CAFChannelLayout *caf_channel_layout = malloc ((size_t) caf_chunk_header.mChunkSize); + CAFChannelLayout *caf_channel_layout; - if (caf_chunk_header.mChunkSize < sizeof (CAFChannelLayout) || - !DoReadFile (infile, caf_channel_layout, (uint32_t) caf_chunk_header.mChunkSize, &bcount) || + if (caf_chunk_header.mChunkSize < sizeof (CAFChannelLayout) || caf_chunk_header.mChunkSize > 1024) { + error_line ("this .CAF file has an invalid 'chan' chunk!"); + return WAVPACK_SOFT_ERROR; + } + + if (debug_logging_mode) + error_line ("'chan' chunk is %d bytes", (int) caf_chunk_header.mChunkSize); + + caf_channel_layout = malloc ((size_t) caf_chunk_header.mChunkSize); + + if (!DoReadFile (infile, caf_channel_layout, (uint32_t) caf_chunk_header.mChunkSize, &bcount) || bcount != caf_chunk_header.mChunkSize) { error_line ("%s is not a valid .CAF file!", infilename); free (caf_channel_layout); @@ -495,8 +504,15 @@ int ParseCaffHeaderConfig (FILE *infile, char *infilename, char *fourcc, Wavpack } else { // just copy unknown chunks to output file - int bytes_to_copy = (uint32_t) caf_chunk_header.mChunkSize; - char *buff = malloc (bytes_to_copy); + uint32_t bytes_to_copy = (uint32_t) caf_chunk_header.mChunkSize; + char *buff; + + if (caf_chunk_header.mChunkSize < 0 || caf_chunk_header.mChunkSize > 1048576) { + error_line ("%s is not a valid .CAF file!", infilename); + return WAVPACK_SOFT_ERROR; + } + + buff = malloc (bytes_to_copy); if (debug_logging_mode) error_line ("extra unknown chunk \"%c%c%c%c\" of %d bytes", ++++++ wavpack-CVE-2018-6767.patch ++++++ >From d5bf76b5a88d044a1be1d5656698e3ba737167e5 Mon Sep 17 00:00:00 2001 From: David Bryant <[email protected]> Date: Sun, 4 Feb 2018 11:28:15 -0800 Subject: [PATCH] issue #27, do not overwrite stack on corrupt RF64 file --- cli/riff.c | 39 ++++++++++++++++++++++++++++++++------- 1 file changed, 32 insertions(+), 7 deletions(-) diff --git a/cli/riff.c b/cli/riff.c index 8b1af45..de98c1e 100644 --- a/cli/riff.c +++ b/cli/riff.c @@ -42,6 +42,7 @@ typedef struct { #pragma pack(pop) +#define CS64ChunkFormat "4D" #define DS64ChunkFormat "DDDL" #define WAVPACK_NO_ERROR 0 @@ -101,13 +102,13 @@ int ParseRiffHeaderConfig (FILE *infile, char *infilename, char *fourcc, Wavpack if (!strncmp (chunk_header.ckID, "ds64", 4)) { if (chunk_header.ckSize < sizeof (DS64Chunk) || - !DoReadFile (infile, &ds64_chunk, chunk_header.ckSize, &bcount) || - bcount != chunk_header.ckSize) { + !DoReadFile (infile, &ds64_chunk, sizeof (DS64Chunk), &bcount) || + bcount != sizeof (DS64Chunk)) { error_line ("%s is not a valid .WAV file!", infilename); return WAVPACK_SOFT_ERROR; } else if (!(config->qmode & QMODE_NO_STORE_WRAPPER) && - !WavpackAddWrapper (wpc, &ds64_chunk, chunk_header.ckSize)) { + !WavpackAddWrapper (wpc, &ds64_chunk, sizeof (DS64Chunk))) { error_line ("%s", WavpackGetErrorMessage (wpc)); return WAVPACK_SOFT_ERROR; } @@ -315,10 +316,11 @@ int ParseRiffHeaderConfig (FILE *infile, char *infilename, char *fourcc, Wavpack int WriteRiffHeader (FILE *outfile, WavpackContext *wpc, int64_t total_samples, int qmode) { - int do_rf64 = 0, write_junk = 1; + int do_rf64 = 0, write_junk = 1, table_length = 0; ChunkHeader ds64hdr, datahdr, fmthdr; RiffChunkHeader riffhdr; DS64Chunk ds64_chunk; + CS64Chunk cs64_chunk; JunkChunk junkchunk; WaveHeader wavhdr; uint32_t bcount; @@ -380,6 +382,7 @@ int WriteRiffHeader (FILE *outfile, WavpackContext *wpc, int64_t total_samples, strncpy (riffhdr.formType, "WAVE", sizeof (riffhdr.formType)); total_riff_bytes = sizeof (riffhdr) + wavhdrsize + sizeof (datahdr) + ((total_data_bytes + 1) & ~(int64_t)1); if (do_rf64) total_riff_bytes += sizeof (ds64hdr) + sizeof (ds64_chunk); + total_riff_bytes += table_length * sizeof (CS64Chunk); if (write_junk) total_riff_bytes += sizeof (junkchunk); strncpy (fmthdr.ckID, "fmt ", sizeof (fmthdr.ckID)); strncpy (datahdr.ckID, "data", sizeof (datahdr.ckID)); @@ -394,11 +397,12 @@ int WriteRiffHeader (FILE *outfile, WavpackContext *wpc, int64_t total_samples, if (do_rf64) { strncpy (ds64hdr.ckID, "ds64", sizeof (ds64hdr.ckID)); - ds64hdr.ckSize = sizeof (ds64_chunk); + ds64hdr.ckSize = sizeof (ds64_chunk) + (table_length * sizeof (CS64Chunk)); CLEAR (ds64_chunk); ds64_chunk.riffSize64 = total_riff_bytes; ds64_chunk.dataSize64 = total_data_bytes; ds64_chunk.sampleCount64 = total_samples; + ds64_chunk.tableLength = table_length; riffhdr.ckSize = (uint32_t) -1; datahdr.ckSize = (uint32_t) -1; WavpackNativeToLittleEndian (&ds64hdr, ChunkHeaderFormat); @@ -409,6 +413,14 @@ int WriteRiffHeader (FILE *outfile, WavpackContext *wpc, int64_t total_samples, datahdr.ckSize = (uint32_t) total_data_bytes; } + // this "table" is just a dummy placeholder for testing (normally not written) + + if (table_length) { + strncpy (cs64_chunk.ckID, "dmmy", sizeof (cs64_chunk.ckID)); + cs64_chunk.chunkSize64 = 12345678; + WavpackNativeToLittleEndian (&cs64_chunk, CS64ChunkFormat); + } + // write the RIFF chunks up to just before the data starts WavpackNativeToLittleEndian (&riffhdr, ChunkHeaderFormat); @@ -418,8 +430,21 @@ int WriteRiffHeader (FILE *outfile, WavpackContext *wpc, int64_t total_samples, if (!DoWriteFile (outfile, &riffhdr, sizeof (riffhdr), &bcount) || bcount != sizeof (riffhdr) || (do_rf64 && (!DoWriteFile (outfile, &ds64hdr, sizeof (ds64hdr), &bcount) || bcount != sizeof (ds64hdr))) || - (do_rf64 && (!DoWriteFile (outfile, &ds64_chunk, sizeof (ds64_chunk), &bcount) || bcount != sizeof (ds64_chunk))) || - (write_junk && (!DoWriteFile (outfile, &junkchunk, sizeof (junkchunk), &bcount) || bcount != sizeof (junkchunk))) || + (do_rf64 && (!DoWriteFile (outfile, &ds64_chunk, sizeof (ds64_chunk), &bcount) || bcount != sizeof (ds64_chunk)))) { + error_line ("can't write .WAV data, disk probably full!"); + return FALSE; + } + + // again, this is normally not written except for testing + + while (table_length--) + if (!DoWriteFile (outfile, &cs64_chunk, sizeof (cs64_chunk), &bcount) || bcount != sizeof (cs64_chunk)) { + error_line ("can't write .WAV data, disk probably full!"); + return FALSE; + } + + + if ((write_junk && (!DoWriteFile (outfile, &junkchunk, sizeof (junkchunk), &bcount) || bcount != sizeof (junkchunk))) || !DoWriteFile (outfile, &fmthdr, sizeof (fmthdr), &bcount) || bcount != sizeof (fmthdr) || !DoWriteFile (outfile, &wavhdr, wavhdrsize, &bcount) || bcount != wavhdrsize || !DoWriteFile (outfile, &datahdr, sizeof (datahdr), &bcount) || bcount != sizeof (datahdr)) {
