mirror of
https://github.com/openembedded/meta-openembedded.git
synced 2026-06-13 17:39:57 +00:00
sox: patch CVE-2017-15371
Details: https://nvd.nist.gov/vuln/detail/CVE-2017-15371 Pick the patch that was identified by Debian[1] to fix the solution. [1]: https://security-tracker.debian.org/tracker/CVE-2017-15371 Signed-off-by: Gyorgy Sarvari <skandigraun@gmail.com>
This commit is contained in:
@@ -0,0 +1,40 @@
|
||||
From 83bf78913ee813c2c767854eb16acd9e6fb779cb Mon Sep 17 00:00:00 2001
|
||||
From: Mans Rullgard <mans@mansr.com>
|
||||
Date: Sun, 5 Nov 2017 15:57:48 +0000
|
||||
Subject: [PATCH] flac: fix crash on corrupt metadata (CVE-2017-15371)
|
||||
|
||||
CVE: CVE-2017-15371
|
||||
Upstream-Status: Backport [https://github.com/mansr/sox/commit/818bdd0ccc1e5b6cae742c740c17fd414935cf39]
|
||||
Signed-off-by: Gyorgy Sarvari <skandigraun@gmail.com>
|
||||
---
|
||||
src/flac.c | 8 +++++---
|
||||
1 file changed, 5 insertions(+), 3 deletions(-)
|
||||
|
||||
diff --git a/src/flac.c b/src/flac.c
|
||||
index 0d7829e..07f45c1 100644
|
||||
--- a/src/flac.c
|
||||
+++ b/src/flac.c
|
||||
@@ -119,9 +119,10 @@ static void decoder_metadata_callback(FLAC__StreamDecoder const * const flac, FL
|
||||
p->total_samples = metadata->data.stream_info.total_samples;
|
||||
}
|
||||
else if (metadata->type == FLAC__METADATA_TYPE_VORBIS_COMMENT) {
|
||||
+ const FLAC__StreamMetadata_VorbisComment *vc = &metadata->data.vorbis_comment;
|
||||
size_t i;
|
||||
|
||||
- if (metadata->data.vorbis_comment.num_comments == 0)
|
||||
+ if (vc->num_comments == 0)
|
||||
return;
|
||||
|
||||
if (ft->oob.comments != NULL) {
|
||||
@@ -129,8 +130,9 @@ static void decoder_metadata_callback(FLAC__StreamDecoder const * const flac, FL
|
||||
return;
|
||||
}
|
||||
|
||||
- for (i = 0; i < metadata->data.vorbis_comment.num_comments; ++i)
|
||||
- sox_append_comment(&ft->oob.comments, (char const *) metadata->data.vorbis_comment.comments[i].entry);
|
||||
+ for (i = 0; i < vc->num_comments; ++i)
|
||||
+ if (vc->comments[i].entry)
|
||||
+ sox_append_comment(&ft->oob.comments, (char const *) vc->comments[i].entry);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -34,6 +34,7 @@ SRC_URI = "${SOURCEFORGE_MIRROR}/sox/sox-${PV}.tar.gz \
|
||||
file://CVE-2017-11358.patch \
|
||||
file://CVE-2017-11359.patch \
|
||||
file://CVE-2017-15370.patch \
|
||||
file://CVE-2017-15371.patch \
|
||||
"
|
||||
SRC_URI[md5sum] = "d04fba2d9245e661f245de0577f48a33"
|
||||
SRC_URI[sha256sum] = "b45f598643ffbd8e363ff24d61166ccec4836fea6d3888881b8df53e3bb55f6c"
|
||||
|
||||
Reference in New Issue
Block a user