From patchwork Fri Oct 18 22:19:21 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Niedermayer X-Patchwork-Id: 15844 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 BA907448BC4 for ; Sat, 19 Oct 2019 01:26:58 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 984FF68AD31; Sat, 19 Oct 2019 01:26:58 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from vie01a-dmta-pe05-3.mx.upcmail.net (vie01a-dmta-pe05-3.mx.upcmail.net [84.116.36.13]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 92B6968AC55 for ; Sat, 19 Oct 2019 01:26:52 +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 1iLacc-0009sF-0Q for ffmpeg-devel@ffmpeg.org; Sat, 19 Oct 2019 00:21:22 +0200 Received: from localhost ([213.47.68.29]) by vie01a-pemc-psmtp-pe12.mail.upcmail.net with ESMTP id LabdiOxlQwlysLabdiWjZR; Sat, 19 Oct 2019 00:20:21 +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=MKtGQD3n3ToA:10 a=1oJP67jkp3AA:10 a=GEAsPZ9sns4A:10 a=ZZnuYtJkoWoA:10 a=nZOtpAppAAAA:20 a=ahrLWvikjjBrpbJEnQsA:9 a=1fhp2MxaeJtTNGEnv6mo:22 a=Z5ABNNGmrOfJ6cZ5bIyy:22 a=jd6J4Gguk5HxikPWLKER:22 From: Michael Niedermayer To: FFmpeg development discussions and patches Date: Sat, 19 Oct 2019 00:19:21 +0200 Message-Id: <20191018221924.677-1-michael@niedermayer.cc> X-Mailer: git-send-email 2.23.0 MIME-Version: 1.0 X-CMAE-Envelope: MS4wfDzx4QbSRfTMsZCZ+mxQsT4hgZnq9tLoEYIlckwyhIPUNIBMCVbyTrDmKDkiLsYGHyeP0FUMNQ5ZduiIpUPVAI+PB8biGNkbmJWvuO/B1VUjITQC6TMR bmk2uHqfV2+S4zKxNGB+ii+HF6VZ6xIpHRkukiKSwi9fa1wEVCKOcDgn Subject: [FFmpeg-devel] [PATCH 1/4] avcodec/vp3: sanity check cropping 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" This check is not based on the specification, which allows instead arbitrary croping Fixes: Timeout (32sec -> 0.1sec) Fixes: 18207/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_THEORA_fuzzer-5666242274263040 Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg Signed-off-by: Michael Niedermayer --- libavcodec/vp3.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/libavcodec/vp3.c b/libavcodec/vp3.c index a2bd2ef07d..a28b9b6c6b 100644 --- a/libavcodec/vp3.c +++ b/libavcodec/vp3.c @@ -2991,6 +2991,8 @@ static int theora_decode_header(AVCodecContext *avctx, GetBitContext *gb) /* sanity check */ if (av_image_check_size(visible_width, visible_height, 0, avctx) < 0 || + visible_width + offset_x + 256 < s->width || + visible_height + offset_y + 256 < s->height || visible_width + offset_x > s->width || visible_height + offset_y > s->height) { av_log(avctx, AV_LOG_ERROR,