diff options
author | Chen Qi <Qi.Chen@windriver.com> | 2017-09-26 15:43:24 +0800 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2017-10-07 23:20:39 +0100 |
commit | 4435ab4a3b2acbd66910dad5c602ec71f8902386 (patch) | |
tree | 5b429173d641ea6df515dbb542ed4a0e4c6ee3e9 /meta/recipes-multimedia/ffmpeg/ffmpeg/CVE-2017-14225.patch | |
parent | 7ea2d2fb57572a03e322810c57e73b9255de9053 (diff) | |
download | poky-4435ab4a3b2acbd66910dad5c602ec71f8902386.tar.gz |
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 <Qi.Chen@windriver.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-multimedia/ffmpeg/ffmpeg/CVE-2017-14225.patch')
-rw-r--r-- | meta/recipes-multimedia/ffmpeg/ffmpeg/CVE-2017-14225.patch | 49 |
1 files changed, 49 insertions, 0 deletions
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 @@ | |||
1 | Subject: [PATCH] ffprobe: Fix null pointer dereference with color primaries | ||
2 | |||
3 | Found-by: AD-lab of venustech | ||
4 | Signed-off-by: Michael Niedermayer <michael@niedermayer.cc> | ||
5 | |||
6 | CVE: CVE-2017-14225 | ||
7 | Upstream-Status: Backport | ||
8 | |||
9 | Signed-off-by: Chen Qi <Qi.Chen@windriver.com> | ||
10 | --- | ||
11 | ffprobe.c | 15 +++++++++++---- | ||
12 | 1 file changed, 11 insertions(+), 4 deletions(-) | ||
13 | |||
14 | diff --git a/ffprobe.c b/ffprobe.c | ||
15 | index a219fc1..df22b30 100644 | ||
16 | --- a/ffprobe.c | ||
17 | +++ b/ffprobe.c | ||
18 | @@ -1899,6 +1899,16 @@ static void print_pkt_side_data(WriterContext *w, | ||
19 | writer_print_section_footer(w); | ||
20 | } | ||
21 | |||
22 | +static void print_primaries(WriterContext *w, enum AVColorPrimaries color_primaries) | ||
23 | +{ | ||
24 | + const char *val = av_color_primaries_name(color_primaries); | ||
25 | + if (!val || color_primaries == AVCOL_PRI_UNSPECIFIED) { | ||
26 | + print_str_opt("color_primaries", "unknown"); | ||
27 | + } else { | ||
28 | + print_str("color_primaries", val); | ||
29 | + } | ||
30 | +} | ||
31 | + | ||
32 | static void clear_log(int need_lock) | ||
33 | { | ||
34 | int i; | ||
35 | @@ -2420,10 +2430,7 @@ static int show_stream(WriterContext *w, AVFormatContext *fmt_ctx, int stream_id | ||
36 | else | ||
37 | print_str_opt("color_transfer", av_color_transfer_name(par->color_trc)); | ||
38 | |||
39 | - if (par->color_primaries != AVCOL_PRI_UNSPECIFIED) | ||
40 | - print_str("color_primaries", av_color_primaries_name(par->color_primaries)); | ||
41 | - else | ||
42 | - print_str_opt("color_primaries", av_color_primaries_name(par->color_primaries)); | ||
43 | + print_primaries(w, par->color_primaries); | ||
44 | |||
45 | if (par->chroma_location != AVCHROMA_LOC_UNSPECIFIED) | ||
46 | print_str("chroma_location", av_chroma_location_name(par->chroma_location)); | ||
47 | -- | ||
48 | 2.1.0 | ||
49 | |||