From 3e27099f9aad1eb48412b07a18dcea398c18245b Mon Sep 17 00:00:00 2001 From: Yue Tao Date: Fri, 25 Apr 2014 16:26:00 +0800 Subject: gst-ffmpeg: fix for Security Advisory CVE-2014-2099 The msrle_decode_frame function in libavcodec/msrle.c in FFmpeg before 2.1.4 does not properly calculate line sizes, which allows remote attackers to cause a denial of service (out-of-bounds array access) or possibly have unspecified other impact via crafted Microsoft RLE video data. http://web.nvd.nist.gov/view/vuln/detail?vulnId=CVE-2014-2099 Signed-off-by: Yue Tao Signed-off-by: Roy Li Signed-off-by: Saul Wold --- ...le-use-av_image_get_linesize-to-calculate.patch | 50 ++++++++++++++++++++++ .../gstreamer/gst-ffmpeg_0.10.13.bb | 1 + 2 files changed, 51 insertions(+) create mode 100644 meta/recipes-multimedia/gstreamer/gst-ffmpeg-0.10.13/0001-avcodec-msrle-use-av_image_get_linesize-to-calculate.patch diff --git a/meta/recipes-multimedia/gstreamer/gst-ffmpeg-0.10.13/0001-avcodec-msrle-use-av_image_get_linesize-to-calculate.patch b/meta/recipes-multimedia/gstreamer/gst-ffmpeg-0.10.13/0001-avcodec-msrle-use-av_image_get_linesize-to-calculate.patch new file mode 100644 index 0000000000..b0a3fb10c7 --- /dev/null +++ b/meta/recipes-multimedia/gstreamer/gst-ffmpeg-0.10.13/0001-avcodec-msrle-use-av_image_get_linesize-to-calculate.patch @@ -0,0 +1,50 @@ +From 573d5fdedae72bf59d8c0b0766fdee171063d36f Mon Sep 17 00:00:00 2001 +From: Michael Niedermayer +Date: Sun, 16 Feb 2014 23:08:52 +0100 +Subject: [PATCH] avcodec/msrle: use av_image_get_linesize() to calculate the + linesize + +Upstream-Status: Backport + +Commit 573d5fdedae72bf59d8c0b0766fdee171063d36f release/0.9 + +Fixes out of array access +Fixes: 14a74a0a2dc67ede543f0e35d834fbbe-asan_heap-oob_49572c_556_cov_215466444_44_001_engine_room.mov +Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind +Signed-off-by: Michael Niedermayer +(cherry picked from commit c919e1ca2ecfc47d796382973ba0e48b8f6f92a2) + +Conflicts: + + libavcodec/msrle.c +(cherry picked from commit bc1c8ec5e65098fd2ccd8456f667151dfc9cda42) + +Signed-off-by: Michael Niedermayer +--- + libavcodec/msrle.c | 3 ++- + 1 files changed, 2 insertions(+), 1 deletions(-) + +diff --git a/libavcodec/msrle.c b/libavcodec/msrle.c +index 30159bb..c39ae7b 100644 +--- a/gst-libs/ext/libav/libavcodec/msrle.c ++++ b/gst-libs/ext/libav/libavcodec/msrle.c +@@ -35,6 +35,7 @@ + #include "avcodec.h" + #include "dsputil.h" + #include "msrledec.h" ++#include "libavutil/imgutils.h" + + typedef struct MsrleContext { + AVCodecContext *avctx; +@@ -107,7 +108,7 @@ static int msrle_decode_frame(AVCodecContext *avctx, + + /* FIXME how to correctly detect RLE ??? */ + if (avctx->height * istride == avpkt->size) { /* assume uncompressed */ +- int linesize = avctx->width * avctx->bits_per_coded_sample / 8; ++ int linesize = av_image_get_linesize(avctx->pix_fmt, avctx->width, 0); + uint8_t *ptr = s->frame.data[0]; + uint8_t *buf = avpkt->data + (avctx->height-1)*istride; + int i, j; +-- +1.7.5.4 + 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 3d1f207b1b..05cc404050 100644 --- a/meta/recipes-multimedia/gstreamer/gst-ffmpeg_0.10.13.bb +++ b/meta/recipes-multimedia/gstreamer/gst-ffmpeg_0.10.13.bb @@ -25,6 +25,7 @@ SRC_URI = "http://gstreamer.freedesktop.org/src/${BPN}/${BPN}-${PV}.tar.bz2 \ file://gst-ffmpeg-CVE-2013-3674.patch \ file://0001-avformat-mpegtsenc-Check-data-array-size-in-mpegts_w.patch \ file://0001-vqavideo-check-chunk-sizes-before-reading-chunks.patch \ + file://0001-avcodec-msrle-use-av_image_get_linesize-to-calculate.patch \ " SRC_URI[md5sum] = "7f5beacaf1312db2db30a026b36888c4" -- cgit 1.2.3-korg