libsndfile1: update security patches
PATCH 1/5 libsndfile1: update security patches
Remove CVE-2017-14245-14246.patch, fix rejected upstream as it doesn't solve the underlying issue.
Instead 0001-a-ulaw-fix-multiple-buffer-overflows-432 also solves CVE-2017-14245 and CVE-2017-14246 properly.
Add patches for CVE-2017-12562 and CVE-2018-19758.
Refresh CVE-2018-13139.patch.
--- ...-a-ulaw-fix-multiple-buffer-overflows-432.patch | 18 ++- .../libsndfile/libsndfile1/CVE-2017-12562.patch | 96 ++++++++++++++++ .../libsndfile1/CVE-2017-14245-14246.patch | 121 --------------------- .../libsndfile/libsndfile1/CVE-2018-13139.patch | 30 ++--- .../libsndfile/libsndfile1/CVE-2018-19758.patch | 34 ++++++ .../libsndfile/libsndfile1_1.0.28.bb | 3 +- 6 files changed, 160 insertions(+), 142 deletions(-) create mode 100644 meta/recipes-multimedia/libsndfile/libsndfile1/CVE-2017-12562.patch delete mode 100644 meta/recipes-multimedia/libsndfile/libsndfile1/CVE-2017-14245-14246.patch create mode 100644 meta/recipes-multimedia/libsndfile/libsndfile1/CVE-2018-19758.patch
meta/recipes-multimedia/libsndfile/libsndfile1/0001-a-ulaw-fix-multiple-buffer-overflows-432.patch +12 -6
@@ -1,3 +1,15 @@ +This patch fixes #429 (CVE-2018-19661 CVE-2018-19662) and #344 (CVE-2017-17456 +CVE-2017-17457). As per +https://github.com/erikd/libsndfile/issues/344#issuecomment-448504425 it also +fixes #317 (CVE-2017-14245 CVE-2017-14246). + +CVE: CVE-2017-14245 CVE-2017-14246 +CVE: CVE-2017-17456 CVE-2017-17457 +CVE: CVE-2018-19661 CVE-2018-19662 + +Upstream-Status: Backport [8ddc442d539ca775d80cdbc7af17a718634a743f] +Signed-off-by: Ross Burton <[email protected]> + From 39453899fe1bb39b2e041fdf51a85aecd177e9c7 Mon Sep 17 00:00:00 2001 From: Changqing Li <[email protected]> Date: Mon, 7 Jan 2019 15:55:03 +0800
@@ -17,12 +29,6 @@ In this case, arbitrarily set the buffer value to 0. This commit fixes #429 (CVE-2018-19661 and CVE-2018-19662) and fixes #344 (CVE-2017-17456 and CVE-2017-17457). -Upstream-Status: Backport[https://github.com/erikd/libsndfile/ -commit/585cc28a93be27d6938f276af0011401b9f7c0ca] - -CVE: CVE-2017-17456 CVE-2017-17457 CVE-2018-19661 CVE-2018-19662 - -Signed-off-by: Changqing Li <[email protected]> --- src/alaw.c | 9 +++++++-- src/ulaw.c | 9 +++++++--
meta/recipes-multimedia/libsndfile/libsndfile1/CVE-2017-12562.patch new file +96 -0
96 lines not on this page · raw message
meta/recipes-multimedia/libsndfile/libsndfile1/CVE-2017-14245-14246.patch deleted +0 -121
121 lines not on this page · raw message
meta/recipes-multimedia/libsndfile/libsndfile1/CVE-2018-13139.patch +16 -14
@@ -1,23 +1,25 @@ -From 5473aeef7875e54bd0f786fbdd259a35aaee875c Mon Sep 17 00:00:00 2001 -From: Changqing Li <[email protected]> -Date: Wed, 10 Oct 2018 08:59:30 +0800 -Subject: [PATCH] libsndfile1: patch for CVE-2018-13139 +CVE: CVE-2018-13139 +Upstream-Status: Backport [9dc989eb89cd697e19897afa616d6ab0debe4822] +Signed-off-by: Ross Burton <[email protected]> -Upstream-Status: Backport [https://github.com/bwarden/libsndfile/ -commit/df18323c622b54221ee7ace74b177cdcccc152d7] +From 9dc989eb89cd697e19897afa616d6ab0debe4822 Mon Sep 17 00:00:00 2001 +From: "Brett T. Warden" <[email protected]> +Date: Tue, 28 Aug 2018 12:01:17 -0700 +Subject: [PATCH] Check MAX_CHANNELS in sndfile-deinterleave -CVE: CVE-2018-13139 +Allocated buffer has space for only 16 channels. Verify that input file +meets this limit. -Signed-off-by: Changqing Li <[email protected]> +Fixes #397 --- - programs/sndfile-deinterleave.c | 6 ++++++ - 1 file changed, 6 insertions(+) + programs/sndfile-deinterleave.c | 7 +++++++ + 1 file changed, 7 insertions(+) diff --git a/programs/sndfile-deinterleave.c b/programs/sndfile-deinterleave.c -index e27593e..721bee7 100644 +index e27593e2..cb497e1f 100644 --- a/programs/sndfile-deinterleave.c +++ b/programs/sndfile-deinterleave.c -@@ -89,6 +89,12 @@ main (int argc, char **argv) +@@ -89,6 +89,13 @@ main (int argc, char **argv) exit (1) ; } ;
@@ -27,9 +29,9 @@ index e27593e..721bee7 100644 + exit (1) ; + } ; + ++ state.channels = sfinfo.channels ; sfinfo.channels = 1 ; -- -2.7.4 - +2.11.0
meta/recipes-multimedia/libsndfile/libsndfile1/CVE-2018-19758.patch new file +34 -0
@@ -0,0 +1,34 @@ +There is a heap-based buffer over-read at wav.c in wav_write_header in +libsndfile 1.0.28 that will cause a denial of service. + +CVE: CVE-2018-19758 +Upstream-Status: Backport [42132c543358cee9f7c3e9e9b15bb6c1063a608e] +Signed-off-by: Ross Burton <[email protected]> + +From c12173b0197dd0c5cfa2cd27977e982d2ae59486 Mon Sep 17 00:00:00 2001 +From: Erik de Castro Lopo <[email protected]> +Date: Tue, 1 Jan 2019 20:11:46 +1100 +Subject: [PATCH] src/wav.c: Fix heap read overflow + +This is CVE-2018-19758. + +Closes: https://github.com/erikd/libsndfile/issues/435 +--- + src/wav.c | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/src/wav.c b/src/wav.c +index e8405b55..6fb94ae8 100644 +--- a/src/wav.c ++++ b/src/wav.c +@@ -1094,6 +1094,8 @@ wav_write_header (SF_PRIVATE *psf, int calc_length) + psf_binheader_writef (psf, "44", 0, 0) ; /* SMTPE format */ + psf_binheader_writef (psf, "44", psf->instrument->loop_count, 0) ; + ++ /* Loop count is signed 16 bit number so we limit it range to something sensible. */ ++ psf->instrument->loop_count &= 0x7fff ; + for (tmp = 0 ; tmp < psf->instrument->loop_count ; tmp++) + { int type ; + +-- +2.11.0
meta/recipes-multimedia/libsndfile/libsndfile1_1.0.28.bb +2 -1
@@ -10,11 +10,12 @@ SRC_URI = "http://www.mega-nerd.com/libsndfile/files/libsndfile-${PV}.tar.gz \ file://CVE-2017-8361-8365.patch \ file://CVE-2017-8362.patch \ file://CVE-2017-8363.patch \ - file://CVE-2017-14245-14246.patch \ file://CVE-2017-14634.patch \ file://CVE-2018-13139.patch \ file://0001-a-ulaw-fix-multiple-buffer-overflows-432.patch \ file://CVE-2018-19432.patch \ + file://CVE-2017-12562.patch \ + file://CVE-2018-19758.patch \ " SRC_URI[md5sum] = "646b5f98ce89ac60cdb060fcd398247c"
Signature · 1 line
2.11.0
PATCH 2/5 icu: fix CVE-2018-18928
--- meta/recipes-support/icu/icu/CVE-2018-18928.patch | 63 +++++++++++++++++++++++ meta/recipes-support/icu/icu_63.1.bb | 1 + 2 files changed, 64 insertions(+) create mode 100644 meta/recipes-support/icu/icu/CVE-2018-18928.patch
meta/recipes-support/icu/icu/CVE-2018-18928.patch new file +63 -0
@@ -0,0 +1,63 @@ +CVE: CVE-2018-18928 +Upstream-Status: Backport +Signed-off-by: Ross Burton <[email protected]> + +From 53d8c8f3d181d87a6aa925b449b51c4a2c922a51 Mon Sep 17 00:00:00 2001 +From: Shane Carr <[email protected]> +Date: Mon, 29 Oct 2018 23:52:44 -0700 +Subject: [PATCH] ICU-20246 Fixing another integer overflow in number parsing. + +--- + i18n/fmtable.cpp | 2 +- + i18n/number_decimalquantity.cpp | 5 ++++- + test/intltest/numfmtst.cpp | 8 ++++++++ + 6 files changed, 31 insertions(+), 4 deletions(-) + +diff --git a/i18n/fmtable.cpp b/i18n/fmtable.cpp +index 45c7024fc29..8601d95f4a6 100644 +--- a/i18n/fmtable.cpp ++++ b/i18n/fmtable.cpp +@@ -734,7 +734,7 @@ CharString *Formattable::internalGetCharString(UErrorCode &status) { + // not print scientific notation for magnitudes greater than -5 and smaller than some amount (+5?). + if (fDecimalQuantity->isZero()) { + fDecimalStr->append("0", -1, status); +- } else if (std::abs(fDecimalQuantity->getMagnitude()) < 5) { ++ } else if (fDecimalQuantity->getMagnitude() != INT32_MIN && std::abs(fDecimalQuantity->getMagnitude()) < 5) { + fDecimalStr->appendInvariantChars(fDecimalQuantity->toPlainString(), status); + } else { + fDecimalStr->appendInvariantChars(fDecimalQuantity->toScientificString(), status); +diff --git a/i18n/number_decimalquantity.cpp b/i18n/number_decimalquantity.cpp +index 47b930a564b..d5dd7ae694c 100644 +--- a/i18n/number_decimalquantity.cpp ++++ b/i18n/number_decimalquantity.cpp +@@ -898,7 +898,10 @@ UnicodeString DecimalQuantity::toScientificString() const { + } + result.append(u'E'); + int32_t _scale = upperPos + scale; +- if (_scale < 0) { ++ if (_scale == INT32_MIN) { ++ result.append({u"-2147483648", -1}); ++ return result; ++ } else if (_scale < 0) { + _scale *= -1; + result.append(u'-'); + } else { +diff --git a/test/intltest/numfmtst.cpp b/test/intltest/numfmtst.cpp +index 34355939113..8d52dc122bf 100644 +--- a/test/intltest/numfmtst.cpp ++++ b/test/intltest/numfmtst.cpp +@@ -9226,6 +9226,14 @@ void NumberFormatTest::Test20037_ScientificIntegerOverflow() { + assertEquals(u"Should not overflow and should parse only the first exponent", + u"1E-2147483647", + {sp.data(), sp.length(), US_INV}); ++ ++ // Test edge case overflow of exponent ++ result = Formattable(); ++ nf->parse(u".0003e-2147483644", result, status); ++ sp = result.getDecimalNumber(status); ++ assertEquals(u"Should not overflow", ++ u"3E-2147483648", ++ {sp.data(), sp.length(), US_INV}); + } + + void NumberFormatTest::Test13840_ParseLongStringCrash() {
meta/recipes-support/icu/icu_63.1.bb +1 -0
@@ -17,6 +17,7 @@ SRC_URI = "${BASE_SRC_URI} \ file://icu-pkgdata-large-cmd.patch \ file://fix-install-manx.patch \ file://0002-Add-ARC-support.patch \ + file://CVE-2018-18928.patch \ " SRC_URI_append_class-target = "\
Signature · 1 line
2.11.0
PATCH 3/5 file: upgrade to 5.36
In reply to Ross BurtonUpgrade to 5.36.
Drop debian-742262.patch, this appears to have been fixed properly upstream some releases ago.
---
.../recipes-devtools/file/file/debian-742262.patch | 27 ----------------------
.../file/{file_5.35.bb => file_5.36.bb} | 6 ++---
2 files changed, 2 insertions(+), 31 deletions(-)
delete mode 100644 meta/recipes-devtools/file/file/debian-742262.patch
rename meta/recipes-devtools/file/{file_5.35.bb => file_5.36.bb} (90%)meta/recipes-devtools/file/file/debian-742262.patch deleted +0 -27
@@ -1,27 +0,0 @@ -The awk pattern was checked *before* the Perl pattern, so the -perl script with BEGIN{...} would be reported as awk, this patch fixes it. - -Upstream-Status: Backport [debian] - -Signed-off-by: Christoph Biedl <[email protected]> -Signed-off-by: Robert Yang <[email protected]> - -Rebase on 5.31 - -Signed-off-by: Fan Xin <[email protected]> ---- - magic/Magdir/commands | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/magic/Magdir/commands b/magic/Magdir/commands -index f6ad1c8..f79e7dd 100644 ---- a/magic/Magdir/commands -+++ b/magic/Magdir/commands -@@ -57,6 +57,7 @@ - 0 string/wt #!\ /usr/bin/awk awk script text executable - !:mime text/x-awk - 0 regex/4096 =^[\040\t\f\r\n]{0,100}BEGIN[\040\t\f\r\n]{0,100}[{] awk or perl script text -+!:strength - 12 - - # AT&T Bell Labs' Plan 9 shell - 0 string/wt #!\ /bin/rc Plan 9 rc shell script text executable
meta/recipes-devtools/file/file_5.36.bb renamed from meta/recipes-devtools/file/file_5.35.bb +2 -4
@@ -14,11 +14,9 @@ DEPENDS_class-native = "zlib-native" # Blacklist a bogus tag in upstream check UPSTREAM_CHECK_GITTAGREGEX = "FILE(?P<pver>(?!6_23).+)" -SRC_URI = "git://github.com/file/file.git \ - file://debian-742262.patch \ - " +SRC_URI = "git://github.com/file/file.git" -SRCREV = "d1ff3af7a2c6b38bdbdde7af26b59e3c50a48fff" +SRCREV = "f3a4b9ada3ca99e62c62b9aa78eee4935a8094fe" S = "${WORKDIR}/git" inherit autotools update-alternatives
Signature · 1 line
2.11.0
PATCH 4/5 libarchive: integrate security fixes
In reply to Ross BurtonFix the following CVEs by backporting patches from upstream:
- CVE-2019-1000019
- CVE-2019-1000020
- CVE-2018-1000877
- CVE-2018-1000878
- CVE-2018-1000879
- CVE-2018-1000880
--- .../libarchive/libarchive/CVE-2018-1000877.patch | 38 +++++++++++ .../libarchive/libarchive/CVE-2018-1000878.patch | 79 ++++++++++++++++++++++ .../libarchive/libarchive/CVE-2018-1000879.patch | 50 ++++++++++++++ .../libarchive/libarchive/CVE-2018-1000880.patch | 44 ++++++++++++ .../libarchive/libarchive/CVE-2019-1000019.patch | 59 ++++++++++++++++ .../libarchive/libarchive/CVE-2019-1000020.patch | 61 +++++++++++++++++ .../libarchive/libarchive_3.3.3.bb | 6 ++ 7 files changed, 337 insertions(+) create mode 100644 meta/recipes-extended/libarchive/libarchive/CVE-2018-1000877.patch create mode 100644 meta/recipes-extended/libarchive/libarchive/CVE-2018-1000878.patch create mode 100644 meta/recipes-extended/libarchive/libarchive/CVE-2018-1000879.patch create mode 100644 meta/recipes-extended/libarchive/libarchive/CVE-2018-1000880.patch create mode 100644 meta/recipes-extended/libarchive/libarchive/CVE-2019-1000019.patch create mode 100644 meta/recipes-extended/libarchive/libarchive/CVE-2019-1000020.patch
meta/recipes-extended/libarchive/libarchive/CVE-2018-1000877.patch new file +38 -0
@@ -0,0 +1,38 @@ +CVE: CVE-2018-1000877 +Upstream-Status: Backport +Signed-off-by: Ross Burton <[email protected]> + +From 021efa522ad729ff0f5806c4ce53e4a6cc1daa31 Mon Sep 17 00:00:00 2001 +From: Daniel Axtens <[email protected]> +Date: Tue, 20 Nov 2018 17:56:29 +1100 +Subject: [PATCH] Avoid a double-free when a window size of 0 is specified + +new_size can be 0 with a malicious or corrupted RAR archive. + +realloc(area, 0) is equivalent to free(area), so the region would +be free()d here and the free()d again in the cleanup function. + +Found with a setup running AFL, afl-rb, and qsym. +--- + libarchive/archive_read_support_format_rar.c | 5 +++++ + 1 file changed, 5 insertions(+) + +diff --git a/libarchive/archive_read_support_format_rar.c b/libarchive/archive_read_support_format_rar.c +index 23452222..6f419c27 100644 +--- a/libarchive/archive_read_support_format_rar.c ++++ b/libarchive/archive_read_support_format_rar.c +@@ -2300,6 +2300,11 @@ parse_codes(struct archive_read *a) + new_size = DICTIONARY_MAX_SIZE; + else + new_size = rar_fls((unsigned int)rar->unp_size) << 1; ++ if (new_size == 0) { ++ archive_set_error(&a->archive, ARCHIVE_ERRNO_FILE_FORMAT, ++ "Zero window size is invalid."); ++ return (ARCHIVE_FATAL); ++ } + new_window = realloc(rar->lzss.window, new_size); + if (new_window == NULL) { + archive_set_error(&a->archive, ENOMEM, +-- +2.20.0 +
meta/recipes-extended/libarchive/libarchive/CVE-2018-1000878.patch new file +79 -0
79 lines not on this page · raw message
meta/recipes-extended/libarchive/libarchive/CVE-2018-1000879.patch new file +50 -0
50 lines not on this page · raw message
meta/recipes-extended/libarchive/libarchive/CVE-2018-1000880.patch new file +44 -0
44 lines not on this page · raw message
meta/recipes-extended/libarchive/libarchive/CVE-2019-1000019.patch new file +59 -0
59 lines not on this page · raw message
meta/recipes-extended/libarchive/libarchive/CVE-2019-1000020.patch new file +61 -0
61 lines not on this page · raw message
meta/recipes-extended/libarchive/libarchive_3.3.3.bb +6 -0
@@ -34,6 +34,12 @@ EXTRA_OECONF += "--enable-largefile" SRC_URI = "http://libarchive.org/downloads/libarchive-${PV}.tar.gz \ file://non-recursive-extract-and-list.patch \ file://bug1066.patch \ + file://CVE-2018-1000877.patch \ + file://CVE-2018-1000878.patch \ + file://CVE-2018-1000879.patch \ + file://CVE-2018-1000880.patch \ + file://CVE-2019-1000019.patch \ + file://CVE-2019-1000020.patch \ " SRC_URI[md5sum] = "4038e366ca5b659dae3efcc744e72120"
Signature · 1 line
2.11.0
PATCH 5/5 libpng: fix CVE-2019-7317
In reply to Ross Burton--- .../libpng/libpng/CVE-2019-7317.patch | 20 ++++++++++++++++++++ meta/recipes-multimedia/libpng/libpng_1.6.36.bb | 3 ++- 2 files changed, 22 insertions(+), 1 deletion(-) create mode 100644 meta/recipes-multimedia/libpng/libpng/CVE-2019-7317.patch
meta/recipes-multimedia/libpng/libpng/CVE-2019-7317.patch new file +20 -0
@@ -0,0 +1,20 @@ +Use-after-free detected with static analysis. + +CVE: CVE-2019-7317 +Upstream-Status: Submitted [https://github.com/glennrp/libpng/issues/275] +Signed-off-by: Ross Burton <[email protected]> + +diff --git a/png.c b/png.c +index 9d9926f638..efd1aecfbd 100644 +--- a/png.c ++++ b/png.c +@@ -4588,8 +4588,7 @@ png_image_free(png_imagep image) + if (image != NULL && image->opaque != NULL && + image->opaque->error_buf == NULL) + { +- /* Ignore errors here: */ +- (void)png_safe_execute(image, png_image_free_function, image); ++ png_image_free_function(image); + image->opaque = NULL; + } + }
meta/recipes-multimedia/libpng/libpng_1.6.36.bb +2 -1
@@ -9,7 +9,8 @@ DEPENDS = "zlib" LIBV = "16" -SRC_URI = "${SOURCEFORGE_MIRROR}/project/${BPN}/${BPN}${LIBV}/${PV}/${BP}.tar.xz" +SRC_URI = "${SOURCEFORGE_MIRROR}/project/${BPN}/${BPN}${LIBV}/${PV}/${BP}.tar.xz \ + file://CVE-2019-7317.patch" SRC_URI[md5sum] = "df2be2d29c40937fe1f5349b16bc2826" SRC_URI[sha256sum] = "eceb924c1fa6b79172fdfd008d335f0e59172a86a66481e09d4089df872aa319"
Signature · 1 line
2.11.0