diff options
author | Yue Tao <Yue.Tao@windriver.com> | 2014-04-27 19:44:28 +0800 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2014-05-21 19:50:20 +0100 |
commit | dda4671867990e15e63a0b792b92eb6d320e9289 (patch) | |
tree | 5e05334abe7b038a0c3e89b89479947cbc1bb3b1 /meta/recipes-multimedia/gstreamer/gst-ffmpeg-0.10.13 | |
parent | 0255fd5917b6bad2c6f6f8a7974bbfd1e39ac419 (diff) | |
download | poky-dda4671867990e15e63a0b792b92eb6d320e9289.tar.gz |
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
(From OE-Core rev: 0ee8754c973f5eff3ba4d00319a5308888c12b17)
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/recipes-multimedia/gstreamer/gst-ffmpeg-0.10.13')
-rw-r--r-- | meta/recipes-multimedia/gstreamer/gst-ffmpeg-0.10.13/0001-atrac3dec-Check-coding-mode-against-channels.patch | 37 |
1 files changed, 37 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 @@ | |||
1 | From 2502914c5f8eb77659d7c0868396862557a63245 Mon Sep 17 00:00:00 2001 | ||
2 | From: Michael Niedermayer <michaelni@gmx.at> | ||
3 | Date: Fri, 9 Nov 2012 13:26:20 +0100 | ||
4 | Subject: [PATCH] atrac3dec: Check coding mode against channels. | ||
5 | |||
6 | Upstream-Status: Backport | ||
7 | |||
8 | Commit 2502914c5f8eb77659d7c0868396862557a63245 release/1.0 | ||
9 | |||
10 | Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind | ||
11 | Signed-off-by: Michael Niedermayer <michaelni@gmx.at> | ||
12 | (cherry picked from commit 13451f5520ce6b0afde861b2285dda659f8d4fb4) | ||
13 | |||
14 | Conflicts: | ||
15 | |||
16 | libavcodec/atrac3.c | ||
17 | --- | ||
18 | libavcodec/atrac3.c | 5 +++++ | ||
19 | 1 file changed, 5 insertions(+) | ||
20 | |||
21 | diff --git a/libavcodec/atrac3.c b/libavcodec/atrac3.c | ||
22 | index 7d076be..1da4c78 100644 | ||
23 | --- a/gst-libs/ext/libav/libavcodec/atrac3.c | ||
24 | +++ b/gst-libs/ext/libav/libavcodec/atrac3.c | ||
25 | @@ -955,6 +955,11 @@ static av_cold int atrac3_decode_init(AVCodecContext *avctx) | ||
26 | } | ||
27 | /* Check the extradata. */ | ||
28 | |||
29 | + if (q->codingMode == JOINT_STEREO && avctx->channels < 2) { | ||
30 | + av_log(avctx, AV_LOG_ERROR, "Invalid coding mode\n"); | ||
31 | + return AVERROR_INVALIDDATA; | ||
32 | + } | ||
33 | + | ||
34 | if (q->atrac3version != 4) { | ||
35 | av_log(avctx,AV_LOG_ERROR,"Version %d != 4.\n",q->atrac3version); | ||
36 | return AVERROR_INVALIDDATA; | ||
37 | -- | ||