diff options
| author | Leonardo Arena <rnalrd@alpinelinux.org> | 2019-01-31 13:02:52 +0000 |
|---|---|---|
| committer | Leonardo Arena <rnalrd@alpinelinux.org> | 2019-01-31 13:09:31 +0000 |
| commit | e58c4039fb96953e79558384100a86f6a56c32f2 (patch) | |
| tree | 4eb99ae7faed3cc09c3335b65d3cc924d45d3af4 | |
| parent | 298d6f5b5993500c896213f6961102423cde08dc (diff) | |
| download | aports-e58c4039fb96953e79558384100a86f6a56c32f2.tar.bz2 aports-e58c4039fb96953e79558384100a86f6a56c32f2.tar.xz | |
main/wavpack: security fixes (CVE-2018-19840, CVE-2018-19841)
Fixes #9918
| -rw-r--r-- | main/wavpack/APKBUILD | 11 | ||||
| -rw-r--r-- | main/wavpack/CVE-2018-19840.patch | 25 | ||||
| -rw-r--r-- | main/wavpack/CVE-2018-19841.patch | 29 |
3 files changed, 63 insertions, 2 deletions
diff --git a/main/wavpack/APKBUILD b/main/wavpack/APKBUILD index e1dd63971b..12b44ba3cb 100644 --- a/main/wavpack/APKBUILD +++ b/main/wavpack/APKBUILD @@ -3,7 +3,7 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=wavpack pkgver=5.1.0 -pkgrel=2 +pkgrel=3 pkgdesc="Audio compression format with lossless, lossy, and hybrid compression modes" url="http://www.wavpack.com/" arch="all" @@ -16,10 +16,15 @@ source="http://www.wavpack.com/${pkgname}-${pkgver}.tar.bz2 CVE-2018-7254.patch CVE-2018-10536_10537.patch CVE-2018-10538_10539_10540.patch + CVE-2018-19840.patch + CVE-2018-19841.patch " builddir="$srcdir"/$pkgname-$pkgver # secfixes: +# 5.1.0-r3: +# - CVE-2018-19840 +# - CVE-2018-19841 # 5.1.0-r2: # - CVE-2018-10536 # - CVE-2018-10537 @@ -72,4 +77,6 @@ sha512sums="4c31616ae63c3a875afa20f26ce935f7a8f9921e2892b4b8388eca3ccd83b2d686f4 6e8bdb2a1fa1445de7778226bf4db35efa96f6455be3f2c52bd56dc567eba8eeba9a0140965816c2dc340abcdcb966dc6fd647345e419fde3dceba2a512e5395 CVE-2018-7253.patch 8745e1d3b97df6bdc2844c6731c1079afce8aee6cd3ad39557c8442687f80d2e2b278fd5277e35f7793de3035a7923be69a248dd7ab2cae66d92ea43905dae60 CVE-2018-7254.patch fd7ff58c53f9b4cec335e36017c5b1709c5526a2d44a54dfbeb050ea303997418d1fa312ebe39f521a35a6f2151b8a0f5845ee9bf6bbda22bef036e9fc0166a5 CVE-2018-10536_10537.patch -a59eff2a8f47d4383f33667e7737f5e2e639778b367340169f1c5d6335c8948cfd8e1a7554e8b6c05a59d80a04048cf137c0f4fdfd88d2d88757404d3dac31ee CVE-2018-10538_10539_10540.patch" +a59eff2a8f47d4383f33667e7737f5e2e639778b367340169f1c5d6335c8948cfd8e1a7554e8b6c05a59d80a04048cf137c0f4fdfd88d2d88757404d3dac31ee CVE-2018-10538_10539_10540.patch +67d02dd744c638d126cf5a894d1ff2c39726bd4d3771ef7410ea782e5c9a0f9341909432bd4bea9b8959891c38699601c1aac2da6e0eaddaa5a4d679e7f58dd2 CVE-2018-19840.patch +dba007fa8cb2537b6f6c8ee559a98e501e948260ce7e7af7d3fdc8c9145bbbbf85c8fed8030de354459c4b08d3015a0ea769a948636bdfd66e567c0a2d2493c6 CVE-2018-19841.patch" diff --git a/main/wavpack/CVE-2018-19840.patch b/main/wavpack/CVE-2018-19840.patch new file mode 100644 index 0000000000..2da0220258 --- /dev/null +++ b/main/wavpack/CVE-2018-19840.patch @@ -0,0 +1,25 @@ +From 070ef6f138956d9ea9612e69586152339dbefe51 Mon Sep 17 00:00:00 2001 +From: David Bryant <david@wavpack.com> +Date: Thu, 29 Nov 2018 21:00:42 -0800 +Subject: [PATCH] issue #53: error out on zero sample rate + +--- + src/pack_utils.c | 5 +++++ + 1 file changed, 5 insertions(+) + +diff --git a/src/pack_utils.c b/src/pack_utils.c +index 2253f0d..2a83497 100644 +--- a/src/pack_utils.c ++++ b/src/pack_utils.c +@@ -195,6 +195,11 @@ int WavpackSetConfiguration64 (WavpackContext *wpc, WavpackConfig *config, int64 + int num_chans = config->num_channels; + int i; + ++ if (!config->sample_rate) { ++ strcpy (wpc->error_message, "sample rate cannot be zero!"); ++ return FALSE; ++ } ++ + wpc->stream_version = (config->flags & CONFIG_COMPATIBLE_WRITE) ? CUR_STREAM_VERS : MAX_STREAM_VERS; + + if ((config->qmode & QMODE_DSD_AUDIO) && config->bytes_per_sample == 1 && config->bits_per_sample == 8) { diff --git a/main/wavpack/CVE-2018-19841.patch b/main/wavpack/CVE-2018-19841.patch new file mode 100644 index 0000000000..6872ed91e4 --- /dev/null +++ b/main/wavpack/CVE-2018-19841.patch @@ -0,0 +1,29 @@ +From bba5389dc598a92bdf2b297c3ea34620b6679b5b Mon Sep 17 00:00:00 2001 +From: David Bryant <david@wavpack.com> +Date: Thu, 29 Nov 2018 21:53:51 -0800 +Subject: [PATCH] issue #54: fix potential out-of-bounds heap read + +--- + src/open_utils.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/src/open_utils.c b/src/open_utils.c +index 80051fc..4fe0d67 100644 +--- a/src/open_utils.c ++++ b/src/open_utils.c +@@ -1258,13 +1258,13 @@ int WavpackVerifySingleBlock (unsigned char *buffer, int verify_checksum) + #endif + + if (meta_bc == 4) { +- if (*dp++ != (csum & 0xff) || *dp++ != ((csum >> 8) & 0xff) || *dp++ != ((csum >> 16) & 0xff) || *dp++ != ((csum >> 24) & 0xff)) ++ if (*dp != (csum & 0xff) || dp[1] != ((csum >> 8) & 0xff) || dp[2] != ((csum >> 16) & 0xff) || dp[3] != ((csum >> 24) & 0xff)) + return FALSE; + } + else { + csum ^= csum >> 16; + +- if (*dp++ != (csum & 0xff) || *dp++ != ((csum >> 8) & 0xff)) ++ if (*dp != (csum & 0xff) || dp[1] != ((csum >> 8) & 0xff)) + return FALSE; + } + |