From patchwork Tue Jun 30 20:28:30 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Niedermayer X-Patchwork-Id: 20754 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 63299449DE8 for ; Tue, 30 Jun 2020 23:29:45 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 4E4F168925D; Tue, 30 Jun 2020 23:29:45 +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 8EA576883D0 for ; Tue, 30 Jun 2020 23:29:34 +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 1jqMso-000107-0I for ffmpeg-devel@ffmpeg.org; Tue, 30 Jun 2020 22:29:34 +0200 Received: from localhost ([213.47.68.29]) by vie01a-pemc-psmtp-pe12.mail.upcmail.net with ESMTP id qMrqjgapW6Jy6qMrqjvAfM; Tue, 30 Jun 2020 22:28:34 +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=GKl27dFK 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=3ZLOy0Kglzv47xRyQmcA:9 a=1fhp2MxaeJtTNGEnv6mo:22 a=Z5ABNNGmrOfJ6cZ5bIyy:22 a=SsAZrZ5W_gNWK9tOzrEV:22 From: Michael Niedermayer To: FFmpeg development discussions and patches Date: Tue, 30 Jun 2020 22:28:30 +0200 Message-Id: <20200630202832.3672-2-michael@niedermayer.cc> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20200630202832.3672-1-michael@niedermayer.cc> References: <20200630202832.3672-1-michael@niedermayer.cc> X-CMAE-Envelope: MS4wfC6U7xRolUUwnGyg9D1PtE5pP0JsGKQ5pS/WFHzoEr6XUkOhXlK8uIdqAAGXFIesLvGhiZCq5GxBPs6FHH32ss1o6g4q3IyOFCIvhBcn6j63O791pxTb 51w/ejiPIfuY/lnabeCjtIRkHygIQeOuNd7NFRPLUqqxatXOwggAjvwC Subject: [FFmpeg-devel] [PATCH 2/4] avcodec/hcadec: Check total_band_count against imdct_in 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 MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Fixes: index 128 out of bounds for type 'float [128]' Fixes: 23465/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_HCA_fuzzer-5089866596745216 Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg Signed-off-by: Michael Niedermayer --- libavcodec/hcadec.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/libavcodec/hcadec.c b/libavcodec/hcadec.c index 28e7d07cec..11cb157277 100644 --- a/libavcodec/hcadec.c +++ b/libavcodec/hcadec.c @@ -157,6 +157,10 @@ static av_cold int decode_init(AVCodecContext *avctx) } else return AVERROR_INVALIDDATA; + if (c->total_band_count > FF_ARRAY_ELEMS(c->ch->imdct_in)) + return AVERROR_INVALIDDATA; + + while (get_bits_left(gb) >= 32) { chunk = get_bits_long(gb, 32); if (chunk == MKBETAG('v', 'b', 'r', 0)) {