From patchwork Wed Sep 25 10:01:18 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Niedermayer X-Patchwork-Id: 15284 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 2344B44755A for ; Wed, 25 Sep 2019 13:02:59 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 0D6416881E7; Wed, 25 Sep 2019 13:02:59 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from vie01a-dmta-pe05-1.mx.upcmail.net (vie01a-dmta-pe05-1.mx.upcmail.net [84.116.36.11]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id CABCC6882DF for ; Wed, 25 Sep 2019 13:02:49 +0300 (EEST) Received: from [172.31.216.235] (helo=vie01a-pemc-psmtp-pe12.mail.upcmail.net) by vie01a-dmta-pe05.mx.upcmail.net with esmtp (Exim 4.92) (envelope-from ) id 1iD48H-0005Qj-0s for ffmpeg-devel@ffmpeg.org; Wed, 25 Sep 2019 12:02:49 +0200 Received: from localhost ([213.47.68.29]) by vie01a-pemc-psmtp-pe12.mail.upcmail.net with ESMTP id D47JiYHN1wlysD47Ji4GZ1; Wed, 25 Sep 2019 12:01:49 +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=dHqIY4SlPJADJbuerhEA:9 a=1fhp2MxaeJtTNGEnv6mo:22 a=Z5ABNNGmrOfJ6cZ5bIyy:22 a=UDnyf2zBuKT2w-IlGP_r:22 From: Michael Niedermayer To: FFmpeg development discussions and patches Date: Wed, 25 Sep 2019 12:01:18 +0200 Message-Id: <20190925100120.12305-2-michael@niedermayer.cc> X-Mailer: git-send-email 2.23.0 In-Reply-To: <20190925100120.12305-1-michael@niedermayer.cc> References: <20190925100120.12305-1-michael@niedermayer.cc> MIME-Version: 1.0 X-CMAE-Envelope: MS4wfLYzAiHhaEamVM8Ws/BeCeF573fCe9hyZ67rUTFljghQv8o/E0YbOWNyWSLYy4waJwWvUsBAdYGvhrnLwYbzRTJtG1cV/23EQa6Y2RV8GB66LaTIZbzJ xIQz3JIhRmYdZ3m08mcQ2uMfBg5mA6wXDdY/5o1oYmR6KmuXWnPFN1iD Subject: [FFmpeg-devel] [PATCH 2/4] avcodec/cavsdec: Check remaining bitstream in the main loop in decode_pic() 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 (149sec ->1sec) Fixes: 17311/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_CAVS_fuzzer-5679368642232320 Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg Signed-off-by: Michael Niedermayer --- libavcodec/cavsdec.c | 14 ++++++++++++-- tests/ref/fate/cavs | 2 +- 2 files changed, 13 insertions(+), 3 deletions(-) diff --git a/libavcodec/cavsdec.c b/libavcodec/cavsdec.c index 1c4f71824a..436f902ab3 100644 --- a/libavcodec/cavsdec.c +++ b/libavcodec/cavsdec.c @@ -1101,11 +1101,16 @@ static int decode_pic(AVSContext *h) do { if (check_for_slice(h)) skip_count = -1; - if (h->skip_mode_flag && (skip_count < 0)) + if (h->skip_mode_flag && (skip_count < 0)) { + if (get_bits_left(&h->gb) < 1) + break; skip_count = get_ue_golomb(&h->gb); + } if (h->skip_mode_flag && skip_count--) { decode_mb_p(h, P_SKIP); } else { + if (get_bits_left(&h->gb) < 1) + break; mb_type = get_ue_golomb(&h->gb) + P_SKIP + h->skip_mode_flag; if (mb_type > P_8X8) ret = decode_mb_i(h, mb_type - P_8X8 - 1); @@ -1119,11 +1124,16 @@ static int decode_pic(AVSContext *h) do { if (check_for_slice(h)) skip_count = -1; - if (h->skip_mode_flag && (skip_count < 0)) + if (h->skip_mode_flag && (skip_count < 0)) { + if (get_bits_left(&h->gb) < 1) + break; skip_count = get_ue_golomb(&h->gb); + } if (h->skip_mode_flag && skip_count--) { ret = decode_mb_b(h, B_SKIP); } else { + if (get_bits_left(&h->gb) < 1) + break; mb_type = get_ue_golomb(&h->gb) + B_SKIP + h->skip_mode_flag; if (mb_type > B_8X8) ret = decode_mb_i(h, mb_type - B_8X8 - 1); diff --git a/tests/ref/fate/cavs b/tests/ref/fate/cavs index ddcbe04d15..4c3d127fa3 100644 --- a/tests/ref/fate/cavs +++ b/tests/ref/fate/cavs @@ -172,4 +172,4 @@ 0, 166, 166, 1, 622080, 0x05496a5d 0, 167, 167, 1, 622080, 0xdcb4cee8 0, 168, 168, 1, 622080, 0xb41172e5 -0, 169, 169, 1, 622080, 0x56c72478 +0, 169, 169, 1, 622080, 0x26146e0b