summaryrefslogtreecommitdiff
path: root/multimedia/mythtv/files/patch-CVE-2017-14054
diff options
context:
space:
mode:
Diffstat (limited to 'multimedia/mythtv/files/patch-CVE-2017-14054')
-rw-r--r--multimedia/mythtv/files/patch-CVE-2017-1405433
1 files changed, 33 insertions, 0 deletions
diff --git a/multimedia/mythtv/files/patch-CVE-2017-14054 b/multimedia/mythtv/files/patch-CVE-2017-14054
new file mode 100644
index 000000000000..6ac3c5dda043
--- /dev/null
+++ b/multimedia/mythtv/files/patch-CVE-2017-14054
@@ -0,0 +1,33 @@
+From 2bbef8ee271240ce4509b23fd33e35076715a39f Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?=E5=AD=99=E6=B5=A9=20and=20=E5=BC=A0=E6=B4=AA=E4=BA=AE=28?=
+ =?UTF-8?q?=E6=9C=9B=E5=88=9D=29?= <tony.sh and wangchu.zhl@alibaba-inc.com>
+Date: Fri, 25 Aug 2017 01:15:28 +0200
+Subject: [PATCH] avformat/rmdec: Fix DoS due to lack of eof check
+
+Fixes: loop.ivr
+
+Found-by: Xiaohei and Wangchu from Alibaba Security Team
+Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
+(cherry picked from commit 124eb202e70678539544f6268efc98131f19fa49)
+Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
+---
+ libavformat/rmdec.c | 5 ++++-
+ 1 file changed, 4 insertions(+), 1 deletion(-)
+
+diff --git libavformat/rmdec.c libavformat/rmdec.c
+index 4d565291af2..7656812eb16 100644
+--- external/FFmpeg/libavformat/rmdec.c
++++ external/FFmpeg/libavformat/rmdec.c
+@@ -1238,8 +1238,11 @@ static int ivr_read_header(AVFormatContext *s)
+ av_log(s, AV_LOG_DEBUG, "%s = '%s'\n", key, val);
+ } else if (type == 4) {
+ av_log(s, AV_LOG_DEBUG, "%s = '0x", key);
+- for (j = 0; j < len; j++)
++ for (j = 0; j < len; j++) {
++ if (avio_feof(pb))
++ return AVERROR_INVALIDDATA;
+ av_log(s, AV_LOG_DEBUG, "%X", avio_r8(pb));
++ }
+ av_log(s, AV_LOG_DEBUG, "'\n");
+ } else if (len == 4 && type == 3 && !strncmp(key, "StreamCount", tlen)) {
+ nb_streams = value = avio_rb32(pb);