summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorYue Tao <Yue.Tao@windriver.com>2014-04-27 15:37:10 +0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2014-05-21 19:50:20 +0100
commit0255fd5917b6bad2c6f6f8a7974bbfd1e39ac419 (patch)
tree23446f7f7227cc0ae35bddb78a1955dcd16f91ea /meta
parent35773420b413d49ac09cfad7b5fffad0c74bfd89 (diff)
downloadpoky-0255fd5917b6bad2c6f6f8a7974bbfd1e39ac419.tar.gz
gst-ffmpeg: fix for Security Advisory CVE-2013-0852
The parse_picture_segment function in libavcodec/pgssubdec.c in FFmpeg before 1.1 allows remote attackers to have an unspecified impact via crafted RLE data, which triggers an out-of-bounds array access. http://web.nvd.nist.gov/view/vuln/detail?vulnId=CVE-2013-0852 (From OE-Core rev: 37f9371b44bd914fdd64e4c4e4448a2908512203) Signed-off-by: Yue Tao <Yue.Tao@windriver.com> Signed-off-by: Roy Li <rongqing.li@windriver.com> Signed-off-by: Saul Wold <sgw@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r--meta/recipes-multimedia/gstreamer/gst-ffmpeg-0.10.13/0001-pgssubdec-check-RLE-size-before-copying.-Fix-out-of-.patch34
-rw-r--r--meta/recipes-multimedia/gstreamer/gst-ffmpeg_0.10.13.bb1
2 files changed, 35 insertions, 0 deletions
diff --git a/meta/recipes-multimedia/gstreamer/gst-ffmpeg-0.10.13/0001-pgssubdec-check-RLE-size-before-copying.-Fix-out-of-.patch b/meta/recipes-multimedia/gstreamer/gst-ffmpeg-0.10.13/0001-pgssubdec-check-RLE-size-before-copying.-Fix-out-of-.patch
new file mode 100644
index 0000000000..1041347c87
--- /dev/null
+++ b/meta/recipes-multimedia/gstreamer/gst-ffmpeg-0.10.13/0001-pgssubdec-check-RLE-size-before-copying.-Fix-out-of-.patch
@@ -0,0 +1,34 @@
1From 28bf685bfc6d0c744369cdf367f61a78d80d0b01 Mon Sep 17 00:00:00 2001
2From: Michael Niedermayer <michaelni@gmx.at>
3Date: Thu, 15 Nov 2012 16:41:28 +0100
4Subject: [PATCH] pgssubdec: check RLE size before copying. Fix out of array
5 accesses
6
7Upstream-Status: Backport
8
9Commit 28bf685bfc6d0c744369cdf367f61a78d80d0b01 release/1.1
10
11Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
12Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
13(cherry picked from commit c0d68be555f5858703383040e04fcd6529777061)
14---
15 libavcodec/pgssubdec.c | 5 +++++
16 1 file changed, 5 insertions(+)
17
18diff --git a/libavcodec/pgssubdec.c b/libavcodec/pgssubdec.c
19index 728f178..26a3c2a 100644
20--- a/gst-libs/ext/libav/libavcodec/pgssubdec.c
21+++ b/gst-libs/ext/libav/libavcodec/pgssubdec.c
22@@ -202,6 +202,11 @@ static int parse_picture_segment(AVCodec
23 return -1;
24 }
25
26+ if (buf_size > rle_bitmap_len) {
27+ av_log(avctx, AV_LOG_ERROR, "too much RLE data\n");
28+ return AVERROR_INVALIDDATA;
29+ }
30+
31 ctx->picture.w = width;
32 ctx->picture.h = height;
33
34--
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 430bcc7f1d..eded98bb32 100644
--- a/meta/recipes-multimedia/gstreamer/gst-ffmpeg_0.10.13.bb
+++ b/meta/recipes-multimedia/gstreamer/gst-ffmpeg_0.10.13.bb
@@ -29,6 +29,7 @@ SRC_URI = "http://gstreamer.freedesktop.org/src/${BPN}/${BPN}-${PV}.tar.bz2 \
29 file://0001-huffyuvdec-Skip-len-0-cases.patch \ 29 file://0001-huffyuvdec-Skip-len-0-cases.patch \
30 file://0001-huffyuvdec-Check-init_vlc-return-codes.patch \ 30 file://0001-huffyuvdec-Check-init_vlc-return-codes.patch \
31 file://0001-alsdec-check-block-length.patch \ 31 file://0001-alsdec-check-block-length.patch \
32 file://0001-pgssubdec-check-RLE-size-before-copying.-Fix-out-of-.patch \
32" 33"
33 34
34SRC_URI[md5sum] = "7f5beacaf1312db2db30a026b36888c4" 35SRC_URI[md5sum] = "7f5beacaf1312db2db30a026b36888c4"