From 4435ab4a3b2acbd66910dad5c602ec71f8902386 Mon Sep 17 00:00:00 2001 From: Chen Qi Date: Tue, 26 Sep 2017 15:43:24 +0800 Subject: ffmpeg: backport patches to fix 12 CVEs Backport patches to fix the following CVEs. CVE-2017-14054 CVE-2017-14055 CVE-2017-14056 CVE-2017-14057 CVE-2017-14058 CVE-2017-14059 CVE-2017-14169 CVE-2017-14170 CVE-2017-14171 CVE-2017-14222 CVE-2017-14223 CVE-2017-14225 (From OE-Core rev: 13862938a6a7a938f8d781655ceaf78a81b57549) Signed-off-by: Chen Qi Signed-off-by: Ross Burton Signed-off-by: Richard Purdie --- .../ffmpeg/ffmpeg/CVE-2017-14225.patch | 49 ++++++++++++++++++++++ 1 file changed, 49 insertions(+) create mode 100644 meta/recipes-multimedia/ffmpeg/ffmpeg/CVE-2017-14225.patch (limited to 'meta/recipes-multimedia/ffmpeg/ffmpeg/CVE-2017-14225.patch') diff --git a/meta/recipes-multimedia/ffmpeg/ffmpeg/CVE-2017-14225.patch b/meta/recipes-multimedia/ffmpeg/ffmpeg/CVE-2017-14225.patch new file mode 100644 index 0000000000..ce6845eecf --- /dev/null +++ b/meta/recipes-multimedia/ffmpeg/ffmpeg/CVE-2017-14225.patch @@ -0,0 +1,49 @@ +Subject: [PATCH] ffprobe: Fix null pointer dereference with color primaries + +Found-by: AD-lab of venustech +Signed-off-by: Michael Niedermayer + +CVE: CVE-2017-14225 +Upstream-Status: Backport + +Signed-off-by: Chen Qi +--- + ffprobe.c | 15 +++++++++++---- + 1 file changed, 11 insertions(+), 4 deletions(-) + +diff --git a/ffprobe.c b/ffprobe.c +index a219fc1..df22b30 100644 +--- a/ffprobe.c ++++ b/ffprobe.c +@@ -1899,6 +1899,16 @@ static void print_pkt_side_data(WriterContext *w, + writer_print_section_footer(w); + } + ++static void print_primaries(WriterContext *w, enum AVColorPrimaries color_primaries) ++{ ++ const char *val = av_color_primaries_name(color_primaries); ++ if (!val || color_primaries == AVCOL_PRI_UNSPECIFIED) { ++ print_str_opt("color_primaries", "unknown"); ++ } else { ++ print_str("color_primaries", val); ++ } ++} ++ + static void clear_log(int need_lock) + { + int i; +@@ -2420,10 +2430,7 @@ static int show_stream(WriterContext *w, AVFormatContext *fmt_ctx, int stream_id + else + print_str_opt("color_transfer", av_color_transfer_name(par->color_trc)); + +- if (par->color_primaries != AVCOL_PRI_UNSPECIFIED) +- print_str("color_primaries", av_color_primaries_name(par->color_primaries)); +- else +- print_str_opt("color_primaries", av_color_primaries_name(par->color_primaries)); ++ print_primaries(w, par->color_primaries); + + if (par->chroma_location != AVCHROMA_LOC_UNSPECIFIED) + print_str("chroma_location", av_chroma_location_name(par->chroma_location)); +-- +2.1.0 + -- cgit v1.2.3-54-g00ecf