From patchwork Wed Oct 9 10:14:51 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Niedermayer X-Patchwork-Id: 15630 Return-Path: X-Original-To: patchwork@ffaux-bg.ffmpeg.org Delivered-To: patchwork@ffaux-bg.ffmpeg.org Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by ffaux.localdomain (Postfix) with ESMTP id 0137D44921F for ; Wed, 9 Oct 2019 13:22:21 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id E287D6881E8; Wed, 9 Oct 2019 13:22:20 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from vie01a-dmta-pe03-1.mx.upcmail.net (vie01a-dmta-pe03-1.mx.upcmail.net [62.179.121.160]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 6AD196881B7 for ; Wed, 9 Oct 2019 13:22:14 +0300 (EEST) Received: from [172.31.216.235] (helo=vie01a-pemc-psmtp-pe12.mail.upcmail.net) by vie01a-dmta-pe03.mx.upcmail.net with esmtp (Exim 4.92) (envelope-from ) id 1iI91N-000AI8-5y for ffmpeg-devel@ffmpeg.org; Wed, 09 Oct 2019 12:16:41 +0200 Received: from localhost ([213.47.68.29]) by vie01a-pemc-psmtp-pe12.mail.upcmail.net with ESMTP id I90OifjlkwlysI90OiS54t; Wed, 09 Oct 2019 12:15:40 +0200 X-Env-Mailfrom: michael@niedermayer.cc X-Env-Rcptto: ffmpeg-devel@ffmpeg.org X-SourceIP: 213.47.68.29 X-CNFS-Analysis: v=2.3 cv=E5OzWpVl c=1 sm=1 tr=0 a=2hcxjKEKjp0CzLx6oWAm4g==:117 a=2hcxjKEKjp0CzLx6oWAm4g==:17 a=jpOVt7BSZ2e4Z31A5e1TngXxSK0=:19 a=MKtGQD3n3ToA:10 a=1oJP67jkp3AA:10 a=GEAsPZ9sns4A:10 a=ZZnuYtJkoWoA:10 a=nZOtpAppAAAA:20 a=C6lz5qv3eMXSt3sPuwYA:9 a=1fhp2MxaeJtTNGEnv6mo:22 a=Z5ABNNGmrOfJ6cZ5bIyy:22 a=UDnyf2zBuKT2w-IlGP_r:22 From: Michael Niedermayer To: FFmpeg development discussions and patches Date: Wed, 9 Oct 2019 12:14:51 +0200 Message-Id: <20191009101454.1608-3-michael@niedermayer.cc> X-Mailer: git-send-email 2.23.0 In-Reply-To: <20191009101454.1608-1-michael@niedermayer.cc> References: <20191009101454.1608-1-michael@niedermayer.cc> MIME-Version: 1.0 X-CMAE-Envelope: MS4wfHNhOXkRYDiAvTPJGt1JMYNWI2JEGh8ckesIVaCfZanmE6rzZYTuhrdF3b7/xzI5LSk3D2Uj0K/eWQkR7kiQKODFdsu7ihlbX2sD2RIONW30evOjDlIT /Hm8yLi4AEmFdI3vCpLMmRL0EHR7ljpB7oF+UURo/0siwzEkF33BiM8/ Subject: [FFmpeg-devel] [PATCH 3/6] avcodec/rv10: Check input for minimal frame size 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 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Fixes: Timeout (18sec -> 4sec) Fixes: 18012/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_RV20_fuzzer-5767486145822720 Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg Signed-off-by: Michael Niedermayer --- libavcodec/rv10.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/libavcodec/rv10.c b/libavcodec/rv10.c index 729e4a8d2c..3b41d30b92 100644 --- a/libavcodec/rv10.c +++ b/libavcodec/rv10.c @@ -550,7 +550,7 @@ static av_cold int rv10_decode_end(AVCodecContext *avctx) } static int rv10_decode_packet(AVCodecContext *avctx, const uint8_t *buf, - int buf_size, int buf_size2) + int buf_size, int buf_size2, int whole_size) { RVDecContext *rv = avctx->priv_data; MpegEncContext *s = &rv->m; @@ -580,6 +580,9 @@ static int rv10_decode_packet(AVCodecContext *avctx, const uint8_t *buf, return AVERROR_INVALIDDATA; } + if (whole_size < s->mb_width * s->mb_height / 8) + return AVERROR_INVALIDDATA; + if ((s->mb_x == 0 && s->mb_y == 0) || !s->current_picture_ptr) { // FIXME write parser so we always have complete frames? if (s->current_picture_ptr) { @@ -754,7 +757,7 @@ static int rv10_decode_frame(AVCodecContext *avctx, void *data, int *got_frame, offset + FFMAX(size, size2) > buf_size) return AVERROR_INVALIDDATA; - if ((ret = rv10_decode_packet(avctx, buf + offset, size, size2)) < 0) + if ((ret = rv10_decode_packet(avctx, buf + offset, size, size2, buf_size)) < 0) return ret; if (ret > 8 * size)