diff options
| author | Yue Tao <Yue.Tao@windriver.com> | 2014-04-27 19:44:28 +0800 |
|---|---|---|
| committer | Saul Wold <sgw@linux.intel.com> | 2014-05-21 08:23:10 -0700 |
| commit | 0ee8754c973f5eff3ba4d00319a5308888c12b17 (patch) | |
| tree | 931b8d57cc9df32508a9f5efecd5337ee8c4c059 /meta/recipes-multimedia | |
| parent | 37f9371b44bd914fdd64e4c4e4448a2908512203 (diff) | |
| download | openembedded-core-0ee8754c973f5eff3ba4d00319a5308888c12b17.tar.gz openembedded-core-0ee8754c973f5eff3ba4d00319a5308888c12b17.tar.bz2 openembedded-core-0ee8754c973f5eff3ba4d00319a5308888c12b17.zip | |
gst-ffmpeg: fix for Security Advisory CVE-2013-0858
The atrac3_decode_init function in libavcodec/atrac3.c in FFmpeg before
1.0.4 allows remote attackers to have an unspecified impact via ATRAC3
data with the joint stereo coding mode set and fewer than two channels.
http://web.nvd.nist.gov/view/vuln/detail?vulnId=CVE-2013-0858
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>
Diffstat (limited to 'meta/recipes-multimedia')
| -rw-r--r-- | meta/recipes-multimedia/gstreamer/gst-ffmpeg-0.10.13/0001-atrac3dec-Check-coding-mode-against-channels.patch | 37 | ||||
| -rw-r--r-- | meta/recipes-multimedia/gstreamer/gst-ffmpeg_0.10.13.bb | 1 |
2 files changed, 38 insertions, 0 deletions
diff --git a/meta/recipes-multimedia/gstreamer/gst-ffmpeg-0.10.13/0001-atrac3dec-Check-coding-mode-against-channels.patch b/meta/recipes-multimedia/gstreamer/gst-ffmpeg-0.10.13/0001-atrac3dec-Check-coding-mode-against-channels.patch new file mode 100644 index 0000000000..42cb5f40b4 --- /dev/null +++ b/meta/recipes-multimedia/gstreamer/gst-ffmpeg-0.10.13/0001-atrac3dec-Check-coding-mode-against-channels.patch @@ -0,0 +1,37 @@ +From 2502914c5f8eb77659d7c0868396862557a63245 Mon Sep 17 00:00:00 2001 +From: Michael Niedermayer <michaelni@gmx.at> +Date: Fri, 9 Nov 2012 13:26:20 +0100 +Subject: [PATCH] atrac3dec: Check coding mode against channels. + +Upstream-Status: Backport + +Commit 2502914c5f8eb77659d7c0868396862557a63245 release/1.0 + +Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind +Signed-off-by: Michael Niedermayer <michaelni@gmx.at> +(cherry picked from commit 13451f5520ce6b0afde861b2285dda659f8d4fb4) + +Conflicts: + + libavcodec/atrac3.c +--- + libavcodec/atrac3.c | 5 +++++ + 1 file changed, 5 insertions(+) + +diff --git a/libavcodec/atrac3.c b/libavcodec/atrac3.c +index 7d076be..1da4c78 100644 +--- a/gst-libs/ext/libav/libavcodec/atrac3.c ++++ b/gst-libs/ext/libav/libavcodec/atrac3.c +@@ -955,6 +955,11 @@ static av_cold int atrac3_decode_init(AVCodecContext *avctx) + } + /* Check the extradata. */ + ++ if (q->codingMode == JOINT_STEREO && avctx->channels < 2) { ++ av_log(avctx, AV_LOG_ERROR, "Invalid coding mode\n"); ++ return AVERROR_INVALIDDATA; ++ } ++ + if (q->atrac3version != 4) { + av_log(avctx,AV_LOG_ERROR,"Version %d != 4.\n",q->atrac3version); + return AVERROR_INVALIDDATA; +-- 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 eded98bb32..a603ff5d48 100644 --- a/meta/recipes-multimedia/gstreamer/gst-ffmpeg_0.10.13.bb +++ b/meta/recipes-multimedia/gstreamer/gst-ffmpeg_0.10.13.bb @@ -30,6 +30,7 @@ SRC_URI = "http://gstreamer.freedesktop.org/src/${BPN}/${BPN}-${PV}.tar.bz2 \ file://0001-huffyuvdec-Check-init_vlc-return-codes.patch \ file://0001-alsdec-check-block-length.patch \ file://0001-pgssubdec-check-RLE-size-before-copying.-Fix-out-of-.patch \ + file://0001-atrac3dec-Check-coding-mode-against-channels.patch \ " SRC_URI[md5sum] = "7f5beacaf1312db2db30a026b36888c4" |