lame: backport patch to fix CVE-2017-13712
cover lame: backport patch to fix CVE-2017-13712
From: Kai Kang <[email protected]>
The following changes since commit eac8a5cf4212feaf8baf230e9ae991939732141d:
oe-build-perf-report-email.py: add cc and bcc options (2017-09-21 23:16:55 +0100)
are available in the git repository at:
git://git.pokylinux.org/poky-contrib kangkai/lame
http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=kangkai/lame
Kai Kang (1):
lame: fix CVE-2017-13712
.../lame/lame/CVE-2017-13712.patch | 309 +++++++++++++++++++++ meta/recipes-multimedia/lame/lame_3.99.5.bb | 4 +- 2 files changed, 312 insertions(+), 1 deletion(-) create mode 100644 meta/recipes-multimedia/lame/lame/CVE-2017-13712.patch
Signature · 1 line
2.14.1
PATCH 1/1 lame: fix CVE-2017-13712
From: Kai Kang <[email protected]>
Backport patch to fix CVE-2017-13712 for lame.
Signed-off-by Kai Kang <[email protected]>
--- .../lame/lame/CVE-2017-13712.patch | 309 +++++++++++++++++++++ meta/recipes-multimedia/lame/lame_3.99.5.bb | 4 +- 2 files changed, 312 insertions(+), 1 deletion(-) create mode 100644 meta/recipes-multimedia/lame/lame/CVE-2017-13712.patch
meta/recipes-multimedia/lame/lame/CVE-2017-13712.patch new file +309 -0
@@ -0,0 +1,309 @@ +Upstream-Status: Backport [http://lame.cvs.sourceforge.net/viewvc/lame/lame/libmp3lame/id3tag.c?r1=1.79&r2=1.80] + +Backport patch to fix CVE-2017-13712 for lame. + +Signed-off-by: Kai Kang <[email protected]> +--- +--- a/libmp3lame/id3tag.c 2017/08/22 19:44:05 1.79 ++++ b/libmp3lame/id3tag.c 2017/08/28 15:39:51 1.80 +@@ -194,7 +194,11 @@ + } + #endif + +- ++static int ++is_lame_internal_flags_null(lame_t gfp) ++{ ++ return (gfp && gfp->internal_flags) ? 0 : 1; ++} + + static int + id3v2_add_ucs2_lng(lame_t gfp, uint32_t frame_id, unsigned short const *desc, unsigned short const *text); +@@ -238,8 +242,7 @@ + static void + id3v2AddAudioDuration(lame_t gfp, double ms) + { +- lame_internal_flags *gfc = gfp != 0 ? gfp->internal_flags : 0; +- SessionConfig_t const *const cfg = &gfc->cfg; ++ SessionConfig_t const *const cfg = &gfp->internal_flags->cfg; /* caller checked pointers */ + char buffer[1024]; + double const max_ulong = MAX_U_32_NUM; + unsigned long playlength_ms; +@@ -280,7 +283,12 @@ + void + id3tag_init(lame_t gfp) + { +- lame_internal_flags *gfc = gfp->internal_flags; ++ lame_internal_flags *gfc = 0; ++ ++ if (is_lame_internal_flags_null(gfp)) { ++ return; ++ } ++ gfc = gfp->internal_flags; + free_id3tag(gfc); + memset(&gfc->tag_spec, 0, sizeof gfc->tag_spec); + gfc->tag_spec.genre_id3v1 = GENRE_NUM_UNKNOWN; +@@ -293,7 +301,12 @@ + void + id3tag_add_v2(lame_t gfp) + { +- lame_internal_flags *gfc = gfp->internal_flags; ++ lame_internal_flags *gfc = 0; ++ ++ if (is_lame_internal_flags_null(gfp)) { ++ return; ++ } ++ gfc = gfp->internal_flags; + gfc->tag_spec.flags &= ~V1_ONLY_FLAG; + gfc->tag_spec.flags |= ADD_V2_FLAG; + } +@@ -301,7 +314,12 @@ + void + id3tag_v1_only(lame_t gfp) + { +- lame_internal_flags *gfc = gfp->internal_flags; ++ lame_internal_flags *gfc = 0; ++ ++ if (is_lame_internal_flags_null(gfp)) { ++ return; ++ } ++ gfc = gfp->internal_flags; + gfc->tag_spec.flags &= ~(ADD_V2_FLAG | V2_ONLY_FLAG); + gfc->tag_spec.flags |= V1_ONLY_FLAG; + } +@@ -309,7 +327,12 @@ + void + id3tag_v2_only(lame_t gfp) + { +- lame_internal_flags *gfc = gfp->internal_flags; ++ lame_internal_flags *gfc = 0; ++ ++ if (is_lame_internal_flags_null(gfp)) { ++ return; ++ } ++ gfc = gfp->internal_flags; + gfc->tag_spec.flags &= ~V1_ONLY_FLAG; + gfc->tag_spec.flags |= V2_ONLY_FLAG; + } +@@ -317,7 +340,12 @@ + void + id3tag_space_v1(lame_t gfp) + { +- lame_internal_flags *gfc = gfp->internal_flags; ++ lame_internal_flags *gfc = 0; ++ ++ if (is_lame_internal_flags_null(gfp)) { ++ return; ++ } ++ gfc = gfp->internal_flags; + gfc->tag_spec.flags &= ~V2_ONLY_FLAG; + gfc->tag_spec.flags |= SPACE_V1_FLAG; + } +@@ -331,7 +359,12 @@ + void + id3tag_set_pad(lame_t gfp, size_t n) + { +- lame_internal_flags *gfc = gfp->internal_flags; ++ lame_internal_flags *gfc = 0; ++ ++ if (is_lame_internal_flags_null(gfp)) { ++ return; ++ } ++ gfc = gfp->internal_flags; + gfc->tag_spec.flags &= ~V1_ONLY_FLAG; + gfc->tag_spec.flags |= PAD_V2_FLAG; + gfc->tag_spec.flags |= ADD_V2_FLAG; +@@ -583,22 +616,29 @@ + int + id3tag_set_albumart(lame_t gfp, const char *image, size_t size) + { +- int mimetype = 0; +- unsigned char const *data = (unsigned char const *) image; +- lame_internal_flags *gfc = gfp->internal_flags; +- +- /* determine MIME type from the actual image data */ +- if (2 < size && data[0] == 0xFF && data[1] == 0xD8) { +- mimetype = MIMETYPE_JPEG; +- } +- else if (4 < size && data[0] == 0x89 && strncmp((const char *) &data[1], "PNG", 3) == 0) { +- mimetype = MIMETYPE_PNG; +- } +- else if (4 < size && strncmp((const char *) data, "GIF8", 4) == 0) { +- mimetype = MIMETYPE_GIF; ++ int mimetype = MIMETYPE_NONE; ++ lame_internal_flags *gfc = 0; ++ ++ if (is_lame_internal_flags_null(gfp)) { ++ return 0; + } +- else { +- return -1; ++ gfc = gfp->internal_flags; ++ ++ if (image != 0) { ++ unsigned char const *data = (unsigned char const *) image; ++ /* determine MIME type from the actual image data */ ++ if (2 < size && data[0] == 0xFF && data[1] == 0xD8) { ++ mimetype = MIMETYPE_JPEG; ++ } ++ else if (4 < size && data[0] == 0x89 && strncmp((const char *) &data[1], "PNG", 3) == 0) { ++ mimetype = MIMETYPE_PNG; ++ } ++ else if (4 < size && strncmp((const char *) data, "GIF8", 4) == 0) { ++ mimetype = MIMETYPE_GIF; ++ } ++ else { ++ return -1; ++ } + } + if (gfc->tag_spec.albumart != 0) { + free(gfc->tag_spec.albumart); +@@ -606,7 +646,7 @@ + gfc->tag_spec.albumart_size = 0; + gfc->tag_spec.albumart_mimetype = MIMETYPE_NONE; + } +- if (size < 1) { ++ if (size < 1 || mimetype == MIMETYPE_NONE) { + return 0; + } + gfc->tag_spec.albumart = lame_calloc(unsigned char, size); +@@ -959,6 +999,9 @@ + if (frame_id == 0) { + return -1; + } ++ if (is_lame_internal_flags_null(gfp)) { ++ return 0; ++ } + if (text == 0) { + return 0; + } +@@ -1008,6 +1051,9 @@ + if (frame_id == 0) { + return -1; + } ++ if (is_lame_internal_flags_null(gfp)) { ++ return 0; ++ } + if (text == 0) { + return 0; + } +@@ -1037,6 +1083,9 @@ + int + id3tag_set_comment_latin1(lame_t gfp, char const *lang, char const *desc, char const *text) + { ++ if (is_lame_internal_flags_null(gfp)) { ++ return 0; ++ } + return id3v2_add_latin1(gfp, ID_COMMENT, lang, desc, text); + } + +@@ -1044,6 +1093,9 @@ + int + id3tag_set_comment_utf16(lame_t gfp, char const *lang, unsigned short const *desc, unsigned short const *text) + { ++ if (is_lame_internal_flags_null(gfp)) { ++ return 0; ++ } + return id3v2_add_ucs2(gfp, ID_COMMENT, lang, desc, text); + } + +@@ -1054,6 +1106,9 @@ + int + id3tag_set_comment_ucs2(lame_t gfp, char const *lang, unsigned short const *desc, unsigned short const *text) + { ++ if (is_lame_internal_flags_null(gfp)) { ++ return 0; ++ } + return id3tag_set_comment_utf16(gfp, lang, desc, text); + } + +@@ -1244,9 +1299,9 @@ + int + id3tag_set_genre(lame_t gfp, const char *genre) + { +- lame_internal_flags *gfc = gfp->internal_flags; ++ lame_internal_flags *gfc = gfp != 0 ? gfp->internal_flags : 0; + int ret = 0; +- if (genre && *genre) { ++ if (gfc && genre && *genre) { + int const num = lookupGenre(genre); + if (num == -1) return num; + gfc->tag_spec.flags |= CHANGED_FLAG; +@@ -1539,6 +1594,9 @@ + int + id3tag_set_fieldvalue(lame_t gfp, const char *fieldvalue) + { ++ if (is_lame_internal_flags_null(gfp)) { ++ return 0; ++ } + if (fieldvalue && *fieldvalue) { + if (strlen(fieldvalue) < 5 || fieldvalue[4] != '=') { + return -1; +@@ -1551,6 +1609,9 @@ + int + id3tag_set_fieldvalue_utf16(lame_t gfp, const unsigned short *fieldvalue) + { ++ if (is_lame_internal_flags_null(gfp)) { ++ return 0; ++ } + if (fieldvalue && *fieldvalue) { + size_t dx = hasUcs2ByteOrderMarker(fieldvalue[0]); + unsigned short const separator = fromLatin1Char(fieldvalue, '='); +@@ -1581,20 +1642,21 @@ + int + id3tag_set_fieldvalue_ucs2(lame_t gfp, const unsigned short *fieldvalue) + { ++ if (is_lame_internal_flags_null(gfp)) { ++ return 0; ++ } + return id3tag_set_fieldvalue_utf16(gfp, fieldvalue); + } + + size_t + lame_get_id3v2_tag(lame_t gfp, unsigned char *buffer, size_t size) + { +- lame_internal_flags *gfc; +- if (gfp == 0) { ++ lame_internal_flags *gfc = 0; ++ ++ if (is_lame_internal_flags_null(gfp)) { + return 0; + } + gfc = gfp->internal_flags; +- if (gfc == 0) { +- return 0; +- } + if (test_tag_spec_flags(gfc, V1_ONLY_FLAG)) { + return 0; + } +@@ -1736,7 +1798,12 @@ + int + id3tag_write_v2(lame_t gfp) + { +- lame_internal_flags *gfc = gfp->internal_flags; ++ lame_internal_flags *gfc = 0; ++ ++ if (is_lame_internal_flags_null(gfp)) { ++ return 0; ++ } ++ gfc = gfp->internal_flags; + #if 0 + debug_tag_spec_flags(gfc, "write v2"); + #endif +@@ -1837,10 +1904,15 @@ + int + id3tag_write_v1(lame_t gfp) + { +- lame_internal_flags *const gfc = gfp->internal_flags; ++ lame_internal_flags* gfc = 0; + size_t i, n, m; + unsigned char tag[128]; + ++ if (is_lame_internal_flags_null(gfp)) { ++ return 0; ++ } ++ gfc = gfp->internal_flags; ++ + m = sizeof(tag); + n = lame_get_id3v1_tag(gfp, tag, m); + if (n > m) {
meta/recipes-multimedia/lame/lame_3.99.5.bb +3 -1
@@ -14,7 +14,9 @@ PR = "r1" SRC_URI = "${SOURCEFORGE_MIRROR}/lame/lame-${PV}.tar.gz \ file://no-gtk1.patch \ - file://lame-3.99.5_fix_for_automake-1.12.x.patch " + file://lame-3.99.5_fix_for_automake-1.12.x.patch \ + file://CVE-2017-13712.patch \ + " SRC_URI[md5sum] = "84835b313d4a8b68f5349816d33e07ce" SRC_URI[sha256sum] = "24346b4158e4af3bd9f2e194bb23eb473c75fb7377011523353196b19b9a23ff"
Signature · 1 line
2.14.1
✗ patchtest: failure for lame: backport patch to fix CVE-2017-13712
In reply to [email protected]== Series Details ==
Series: lame: backport patch to fix CVE-2017-13712
Revision: 1
URL : https://patchwork.openembedded.org/series/9069/
State : failure
== Summary ==
Thank you for submitting this patch series to OpenEmbedded Core. This is an automated response. Several tests have been executed on the proposed series by patchtest resulting in the following failures:
* Patch [1/1] lame: fix CVE-2017-13712 Issue Missing or incorrectly formatted CVE tag in included patch file [test_cve_tag_format] Suggested fix Correct or include the CVE tag on cve patch with format: "CVE: CVE-YYYY-XXXX"
If you believe any of these test results are incorrect, please reply to the mailing list ([email protected]) raising your concerns. Otherwise we would appreciate you correcting the issues and submitting a new version of the patchset if applicable. Please ensure you add/increment the version number when sending the new version (i.e. [PATCH] -> [PATCH v2] -> [PATCH v3] -> ...).
---
Test framework: http://git.yoctoproject.org/cgit/cgit.cgi/patchtest Test suite: http://git.yoctoproject.org/cgit/cgit.cgi/patchtest-oe