From patchwork Sun Aug 13 22:15:55 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Niedermayer X-Patchwork-Id: 4704 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.103.46.211 with SMTP id u202csp3603062vsu; Sun, 13 Aug 2017 15:23:56 -0700 (PDT) X-Received: by 10.223.170.144 with SMTP id h16mr14956438wrc.227.1502663036859; Sun, 13 Aug 2017 15:23:56 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1502663036; cv=none; d=google.com; s=arc-20160816; b=r/tEI5mSt/hJtpFY/gBPRXggTGRhmnhhbp2N8lHUNuN5kpLtHrxPHd5PcNOAVd6rJ3 FaRZrL3B8YEwzodNoGhsdhfgzT+cQkIPN19jlyl3I5o8hcvKcaGHWMy7YbWWVXqsw/Wz mClkE/sYejk/oDFQIRgONpunIp8A49817ypk9TG9HRqMix5sSDSCWa7KUOdSuKPNsI99 F44VESoY0p91qutk+7qtU6jCaRtHBpWwLIxlkL9on5rECzTw/ulLpOTxzoAqbVckY5yB zGIqkRD7tOsU+Ib+IcwRsKHZipef0q12yrSplhPhkqPlIJ9d7xPLHBTcouUOYddt60Fv MT7Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:mime-version:reply-to :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:references:in-reply-to:message-id:date :to:from:delivered-to:arc-authentication-results; bh=sdagon6vZqlERdTCGJKX7iqs74dyEpKrfA6FitOOOe8=; b=lqyqwz9OXgcud/mt7UPx/1Dw54rlJ5zuXGoiML9GmUp/mUDEINLMY0OLdhf94tzfil NUM7peEHIkxu3Oq4NUNX9MfEOBI5Kdy3Uvjw3mPoek+d6Ji9iV0sSTKtVSM3CW6udYfE WHJtYzOswLVxl/rKiwW6X0Knu8zjMYbePpVne4DZCqPL+mkkRjjQ2VWlv+24IMoK8dqO n0U8U2efCBufPJXX2Q7WkWVJYi44JSvqgCFYrpKGVgUfZDq6Rw5eS6/HHcnAN7VYwKgs 7itEgOfGOQtu6ahxr3OOuaRxjrbEFNIIXQW5SG5yzBfT8Aof3hijL0+HuK/FNgMFyudY c84g== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id 79si2940554wms.19.2017.08.13.15.23.56; Sun, 13 Aug 2017 15:23:56 -0700 (PDT) Received-SPF: pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) client-ip=79.124.17.100; Authentication-Results: mx.google.com; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id C7837689D3E; Mon, 14 Aug 2017 01:23:49 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from vie01a-dmta-pe02-1.mx.upcmail.net (vie01a-dmta-pe02-1.mx.upcmail.net [62.179.121.157]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id CA3B8689999 for ; Mon, 14 Aug 2017 01:23:43 +0300 (EEST) Received: from [172.31.216.43] (helo=vie01a-pemc-psmtp-pe01) by vie01a-dmta-pe02.mx.upcmail.net with esmtp (Exim 4.88) (envelope-from ) id 1dh1IR-0001Sd-0B for ffmpeg-devel@ffmpeg.org; Mon, 14 Aug 2017 00:23:47 +0200 Received: from localhost ([213.47.41.20]) by vie01a-pemc-psmtp-pe01 with SMTP @ mailcloud.upcmail.net id wmFx1v00V0S5wYM01mFy9h; Mon, 14 Aug 2017 00:15:58 +0200 X-SourceIP: 213.47.41.20 From: Michael Niedermayer To: FFmpeg development discussions and patches Date: Mon, 14 Aug 2017 00:15:55 +0200 Message-Id: <20170813221555.17253-2-michael@niedermayer.cc> X-Mailer: git-send-email 2.13.0 In-Reply-To: <20170813221555.17253-1-michael@niedermayer.cc> References: <20170813221555.17253-1-michael@niedermayer.cc> Subject: [FFmpeg-devel] [PATCH 2/2] avcodec/ffv1dec: Check for bitstream end in decode_line() X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: FFmpeg development discussions and patches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: FFmpeg development discussions and patches MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Fixes: timeout Fixes: 2971/clusterfuzz-testcase-6130678276030464 Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg Signed-off-by: Michael Niedermayer --- libavcodec/ffv1dec.c | 24 +++++++++++++++++++++--- libavcodec/ffv1dec_template.c | 8 ++++++-- 2 files changed, 27 insertions(+), 5 deletions(-) diff --git a/libavcodec/ffv1dec.c b/libavcodec/ffv1dec.c index 20921c6adf..b13ecd3eab 100644 --- a/libavcodec/ffv1dec.c +++ b/libavcodec/ffv1dec.c @@ -93,6 +93,19 @@ static inline int get_vlc_symbol(GetBitContext *gb, VlcState *const state, return ret; } +static int is_input_end(FFV1Context *s) +{ + if (s->ac != AC_GOLOMB_RICE) { + RangeCoder *const c = &s->c; + if (c->overread > MAX_OVERREAD) + return AVERROR_INVALIDDATA; + } else { + if (get_bits_left(&s->gb) < 1) + return AVERROR_INVALIDDATA; + } + return 0; +} + #define TYPE int16_t #define RENAME(name) name #include "ffv1dec_template.c" @@ -103,7 +116,7 @@ static inline int get_vlc_symbol(GetBitContext *gb, VlcState *const state, #define RENAME(name) name ## 32 #include "ffv1dec_template.c" -static void decode_plane(FFV1Context *s, uint8_t *src, +static int decode_plane(FFV1Context *s, uint8_t *src, int w, int h, int stride, int plane_index, int pixel_stride) { @@ -127,11 +140,15 @@ static void decode_plane(FFV1Context *s, uint8_t *src, // { START_TIMER if (s->avctx->bits_per_raw_sample <= 8) { - decode_line(s, w, sample, plane_index, 8); + int ret = decode_line(s, w, sample, plane_index, 8); + if (ret < 0) + return ret; for (x = 0; x < w; x++) src[x*pixel_stride + stride * y] = sample[1][x]; } else { - decode_line(s, w, sample, plane_index, s->avctx->bits_per_raw_sample); + int ret = decode_line(s, w, sample, plane_index, s->avctx->bits_per_raw_sample); + if (ret < 0) + return ret; if (s->packed_at_lsb) { for (x = 0; x < w; x++) { ((uint16_t*)(src + stride*y))[x*pixel_stride] = sample[1][x]; @@ -144,6 +161,7 @@ static void decode_plane(FFV1Context *s, uint8_t *src, } // STOP_TIMER("decode-line") } } + return 0; } static int decode_slice_header(FFV1Context *f, FFV1Context *fs) diff --git a/libavcodec/ffv1dec_template.c b/libavcodec/ffv1dec_template.c index d41d807e64..37df766773 100644 --- a/libavcodec/ffv1dec_template.c +++ b/libavcodec/ffv1dec_template.c @@ -20,7 +20,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -static av_always_inline void RENAME(decode_line)(FFV1Context *s, int w, +static av_always_inline int RENAME(decode_line)(FFV1Context *s, int w, TYPE *sample[2], int plane_index, int bits) { @@ -31,6 +31,9 @@ static av_always_inline void RENAME(decode_line)(FFV1Context *s, int w, int run_mode = 0; int run_index = s->run_index; + if (is_input_end(s)) + return AVERROR_INVALIDDATA; + if (s->slice_coding_mode == 1) { int i; for (x = 0; x < w; x++) { @@ -41,7 +44,7 @@ static av_always_inline void RENAME(decode_line)(FFV1Context *s, int w, } sample[1][x] = v; } - return; + return 0; } for (x = 0; x < w; x++) { @@ -101,6 +104,7 @@ static av_always_inline void RENAME(decode_line)(FFV1Context *s, int w, sample[1][x] = av_mod_uintp2(RENAME(predict)(sample[1] + x, sample[0] + x) + (SUINT)diff, bits); } s->run_index = run_index; + return 0; } static void RENAME(decode_rgb_frame)(FFV1Context *s, uint8_t *src[3], int w, int h, int stride[3])