mirror of
https://git.yoctoproject.org/poky
synced 2026-04-21 03:32:12 +02:00
libid3tag: handle unknown encodings (CVE-2017-11550)
(From OE-Core rev: 5090afc1b07e62f70ebcf63a7abb75b8552f0a52) (From OE-Core rev: 9be34806ddfbe0e8d214290e0623f2b9779a14b7) Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org> Signed-off-by: Armin Kuster <akuster808@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
committed by
Richard Purdie
parent
df4f089cbf
commit
93ba4bb6a1
@@ -0,0 +1,39 @@
|
||||
In case of an unknown/invalid encoding, id3_parse_string() will
|
||||
return NULL, but the return value wasn't checked resulting
|
||||
in segfault in id3_ucs4_length(). This is the only place
|
||||
the return value wasn't checked.
|
||||
|
||||
Patch taken from Debian:
|
||||
https://sources.debian.org/patches/libid3tag/0.15.1b-14/11_unknown_encoding.dpatch/
|
||||
|
||||
CVE: CVE-2017-11550
|
||||
Upstream-Status: Pending
|
||||
Signed-off-by: Ross Burton <ross.burton@intel.com>
|
||||
|
||||
diff -urNad libid3tag-0.15.1b~/compat.gperf libid3tag-0.15.1b/compat.gperf
|
||||
--- libid3tag-0.15.1b~/compat.gperf 2004-01-23 09:41:32.000000000 +0000
|
||||
+++ libid3tag-0.15.1b/compat.gperf 2007-01-14 14:36:53.000000000 +0000
|
||||
@@ -236,6 +236,10 @@
|
||||
|
||||
encoding = id3_parse_uint(&data, 1);
|
||||
string = id3_parse_string(&data, end - data, encoding, 0);
|
||||
+ if (!string)
|
||||
+ {
|
||||
+ continue;
|
||||
+ }
|
||||
|
||||
if (id3_ucs4_length(string) < 4) {
|
||||
free(string);
|
||||
diff -urNad libid3tag-0.15.1b~/parse.c libid3tag-0.15.1b/parse.c
|
||||
--- libid3tag-0.15.1b~/parse.c 2004-01-23 09:41:32.000000000 +0000
|
||||
+++ libid3tag-0.15.1b/parse.c 2007-01-14 14:37:34.000000000 +0000
|
||||
@@ -165,6 +165,9 @@
|
||||
case ID3_FIELD_TEXTENCODING_UTF_8:
|
||||
ucs4 = id3_utf8_deserialize(ptr, length);
|
||||
break;
|
||||
+ default:
|
||||
+ /* FIXME: Unknown encoding! Print warning? */
|
||||
+ return NULL;
|
||||
}
|
||||
|
||||
if (ucs4 && !full) {
|
||||
@@ -14,6 +14,7 @@ SRC_URI = "${SOURCEFORGE_MIRROR}/mad/libid3tag-${PV}.tar.gz \
|
||||
file://obsolete_automake_macros.patch \
|
||||
file://0001-Fix-gperf-3.1-incompatibility.patch \
|
||||
file://10_utf16.patch \
|
||||
file://unknown-encoding.patch \
|
||||
"
|
||||
UPSTREAM_CHECK_URI = "https://sourceforge.net/projects/mad/files/libid3tag/"
|
||||
UPSTREAM_CHECK_REGEX = "/projects/mad/files/libid3tag/(?P<pver>.*)/$"
|
||||
|
||||
Reference in New Issue
Block a user