diff options
Diffstat (limited to 'meta/recipes-multimedia')
-rw-r--r-- | meta/recipes-multimedia/gstreamer/gst-ffmpeg-0.10.13/gst-ffmpeg-CVE-2013-3674.patch | 26 | ||||
-rw-r--r-- | meta/recipes-multimedia/gstreamer/gst-ffmpeg_0.10.13.bb | 1 |
2 files changed, 27 insertions, 0 deletions
diff --git a/meta/recipes-multimedia/gstreamer/gst-ffmpeg-0.10.13/gst-ffmpeg-CVE-2013-3674.patch b/meta/recipes-multimedia/gstreamer/gst-ffmpeg-0.10.13/gst-ffmpeg-CVE-2013-3674.patch new file mode 100644 index 0000000000..a28404b072 --- /dev/null +++ b/meta/recipes-multimedia/gstreamer/gst-ffmpeg-0.10.13/gst-ffmpeg-CVE-2013-3674.patch | |||
@@ -0,0 +1,26 @@ | |||
1 | avcodec/cdgraphics: check buffer size before use | ||
2 | |||
3 | Fixes out of array accesses | ||
4 | |||
5 | Backported from:http://git.videolan.org/?p=ffmpeg.git;a=commit;h=ad002e1a13a8df934bd6cb2c84175a4780ab8942 | ||
6 | |||
7 | Upstream-status: Backport | ||
8 | |||
9 | Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind | ||
10 | Signed-off-by: Michael Niedermayer <michaelni@gmx.at> | ||
11 | Signed-off-by: Ming Liu <ming.liu@windriver.com> | ||
12 | |||
13 | diff -urpN a/gst-libs/ext/libav/libavcodec/cdgraphics.c b/gst-libs/ext/libav/libavcodec/cdgraphics.c | ||
14 | --- a/gst-libs/ext/libav/libavcodec/cdgraphics.c 2013-07-18 13:17:08.399876575 +0800 | ||
15 | +++ b/gst-libs/ext/libav/libavcodec/cdgraphics.c 2013-07-18 13:18:05.880502267 +0800 | ||
16 | @@ -291,7 +291,9 @@ static int cdg_decode_frame(AVCodecConte | ||
17 | inst = bytestream_get_byte(&buf); | ||
18 | inst &= CDG_MASK; | ||
19 | buf += 2; /// skipping 2 unneeded bytes | ||
20 | - bytestream_get_buffer(&buf, cdg_data, buf_size - CDG_HEADER_SIZE); | ||
21 | + | ||
22 | + if (buf_size > CDG_HEADER_SIZE) | ||
23 | + bytestream_get_buffer(&buf, cdg_data, buf_size - CDG_HEADER_SIZE); | ||
24 | |||
25 | if ((command & CDG_MASK) == CDG_COMMAND) { | ||
26 | switch (inst) { | ||
diff --git a/meta/recipes-multimedia/gstreamer/gst-ffmpeg_0.10.13.bb b/meta/recipes-multimedia/gstreamer/gst-ffmpeg_0.10.13.bb index 2107704618..2dd5b699bd 100644 --- a/meta/recipes-multimedia/gstreamer/gst-ffmpeg_0.10.13.bb +++ b/meta/recipes-multimedia/gstreamer/gst-ffmpeg_0.10.13.bb | |||
@@ -21,6 +21,7 @@ SRC_URI = "http://gstreamer.freedesktop.org/src/${BPN}/${BPN}-${PV}.tar.bz2 \ | |||
21 | file://configure-fix.patch \ | 21 | file://configure-fix.patch \ |
22 | file://h264_qpel_mmx.patch \ | 22 | file://h264_qpel_mmx.patch \ |
23 | file://libav_e500mc.patch \ | 23 | file://libav_e500mc.patch \ |
24 | file://gst-ffmpeg-CVE-2013-3674.patch \ | ||
24 | " | 25 | " |
25 | 26 | ||
26 | SRC_URI[md5sum] = "7f5beacaf1312db2db30a026b36888c4" | 27 | SRC_URI[md5sum] = "7f5beacaf1312db2db30a026b36888c4" |