diff options
| author |   Changqing Li <changqing.li@windriver.com> | 2018-08-21 16:25:45 +0800 |
|---|---|---|
| committer |   Richard Purdie <richard.purdie@linuxfoundation.org> | 2018-08-23 07:45:32 +0100 |
| commit | 82edd652860a2a1430692af402f0df639161b767 (patch) | |
| tree | 7ae6c7b8111ee3274615e2961bc0cb7b77d62b0c | |
| parent | 10a52e436d2f9a40c04271bc8aeb04c75fb11383 (diff) | |
| download | openembedded-core-contrib-82edd652860a2a1430692af402f0df639161b767.tar.gz | |
flac: patch for CVE-2017-6888
Signed-off-by: Changqing Li <changqing.li@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
| -rw-r--r-- | meta/recipes-multimedia/flac/flac/CVE-2017-6888.patch | 37 | ||||
| -rw-r--r-- | meta/recipes-multimedia/flac/flac_1.3.2.bb | 4 |
2 files changed, 40 insertions, 1 deletions
diff --git a/meta/recipes-multimedia/flac/flac/CVE-2017-6888.patch b/meta/recipes-multimedia/flac/flac/CVE-2017-6888.patch new file mode 100644 index 0000000000..f01791680e --- /dev/null +++ b/meta/recipes-multimedia/flac/flac/CVE-2017-6888.patch @@ -0,0 +1,37 @@ +From 43ecb6431077ff54e9df27f71737e6e96d6c039f Mon Sep 17 00:00:00 2001 +From: Changqing Li <changqing.li@windriver.com> +Date: Tue, 21 Aug 2018 14:46:43 +0800 +Subject: [PATCH] From 5f47b63e9c971e6391590caf00a0f2a5ed612e67 Mon Sep 17 + 00:00:00 2001 From: Erik de Castro Lopo <erikd@mega-nerd.com> Date: Sat, 8 + Apr 2017 18:34:49 +1000 Subject: [PATCH] stream_decoder.c: Fix a memory leak + +Leak reported by Secunia Research. + +Upstream-Status: Backport[https://git.xiph.org/?p=flac.git;a=commit; + h=4f47b63e9c971e6391590caf00a0f2a5ed612e67] + +Update patch to version 1.3.2 +CVE: CVE-2017-6888 + +Signed-off-by: Changqing Li <changqing.li@windriver.com> +--- + src/libFLAC/stream_decoder.c | 3 +++ + 1 file changed, 3 insertions(+) + +diff --git a/src/libFLAC/stream_decoder.c b/src/libFLAC/stream_decoder.c +index d364b0c..ebf93da 100644 +--- a/src/libFLAC/stream_decoder.c ++++ b/src/libFLAC/stream_decoder.c +@@ -1759,6 +1759,9 @@ FLAC__bool read_metadata_vorbiscomment_(FLAC__StreamDecoder *decoder, FLAC__Stre + } + memset (obj->comments[i].entry, 0, obj->comments[i].length) ; + if (!FLAC__bitreader_read_byte_block_aligned_no_crc(decoder->private_->input, obj->comments[i].entry, obj->comments[i].length)) { ++ /* Current i-th entry is bad, so we delete it. */\ ++ free (obj->comments[i].entry) ; ++ obj->comments[i].entry = NULL ; + obj->num_comments = i; + goto skip; + } +-- +2.7.4 + diff --git a/meta/recipes-multimedia/flac/flac_1.3.2.bb b/meta/recipes-multimedia/flac/flac_1.3.2.bb index 8315ab5a2f..92ef8973e9 100644 --- a/meta/recipes-multimedia/flac/flac_1.3.2.bb +++ b/meta/recipes-multimedia/flac/flac_1.3.2.bb @@ -14,7 +14,9 @@ LIC_FILES_CHKSUM = "file://COPYING.FDL;md5=ad1419ecc56e060eccf8184a87c4285f \ file://include/FLAC/all.h;beginline=65;endline=70;md5=64474f2b22e9e77b28d8b8b25c983a48" DEPENDS = "libogg" -SRC_URI = "http://downloads.xiph.org/releases/flac/${BP}.tar.xz" +SRC_URI = "http://downloads.xiph.org/releases/flac/${BP}.tar.xz \ + file://CVE-2017-6888.patch " + SRC_URI[md5sum] = "454f1bfa3f93cc708098d7890d0499bd" SRC_URI[sha256sum] = "91cfc3ed61dc40f47f050a109b08610667d73477af6ef36dcad31c31a4a8d53f" |