From patchwork Sun Sep 20 20:26:07 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Niedermayer X-Patchwork-Id: 22547 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 E95E844B6CD for ; Sun, 20 Sep 2020 23:27:17 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id CDB7468BA74; Sun, 20 Sep 2020 23:27:17 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from vie01a-dmta-pe05-2.mx.upcmail.net (vie01a-dmta-pe05-2.mx.upcmail.net [84.116.36.12]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 84B9068B9CC for ; Sun, 20 Sep 2020 23:27:09 +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 1kK5vR-0004Cv-0G for ffmpeg-devel@ffmpeg.org; Sun, 20 Sep 2020 22:27:09 +0200 Received: from localhost ([213.47.68.29]) by vie01a-pemc-psmtp-pe12.mail.upcmail.net with ESMTP id K5uTki5lxIr7GK5uTk5Exc; Sun, 20 Sep 2020 22:26:09 +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=QN4WuTDL 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=PgbbB5dxqh-PRt9uCL8A:9 a=1fhp2MxaeJtTNGEnv6mo:22 a=Z5ABNNGmrOfJ6cZ5bIyy:22 a=SsAZrZ5W_gNWK9tOzrEV:22 From: Michael Niedermayer To: FFmpeg development discussions and patches Date: Sun, 20 Sep 2020 22:26:07 +0200 Message-Id: <20200920202608.11653-3-michael@niedermayer.cc> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20200920202608.11653-1-michael@niedermayer.cc> References: <20200920202608.11653-1-michael@niedermayer.cc> X-CMAE-Envelope: MS4wfGDXDWfE795f/gp755T28tfjkS1Oee0y/LgKk8Y6DT4DSaKi8mnrWyLRcGhL0zvjjMslJ2LlU7mZBHgfEuDelJEdSc2e2T0Ldi/CMcL5FRMSWiJ7/pVZ F8w8VonEXz1+PFvnx2FIB6AA5pvKbbXe6UfdpCC27ZVIl0SeXzkkqUo2 Subject: [FFmpeg-devel] [PATCH 3/4] avformat/moflex: Check pop_int() for overflow 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: signed integer overflow: 2 * 2132811776 cannot be represented in type 'int' Fixes: 25722/clusterfuzz-testcase-minimized-ffmpeg_IO_DEMUXER_fuzzer-6221704077246464 Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg Signed-off-by: Michael Niedermayer --- libavformat/moflex.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/libavformat/moflex.c b/libavformat/moflex.c index 2111157408..937f63cb63 100644 --- a/libavformat/moflex.c +++ b/libavformat/moflex.c @@ -62,6 +62,8 @@ static int pop_int(BitReader *br, AVIOContext *pb, int n) if (ret < 0) return ret; + if (ret > INT_MAX - value - value) + return AVERROR_INVALIDDATA; value = 2 * value + ret; }