From patchwork Sun Aug 1 19:30:30 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Niedermayer X-Patchwork-Id: 29172 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:6c0f:0:0:0:0:0 with SMTP id a15csp1003299ioh; Sun, 1 Aug 2021 12:31:54 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxCybPw6QujEpLt0H1EJokZ+Be+9qZWq08JUN7s2yVL+GGt989m4hcDtecNxNzqegaMBgqv X-Received: by 2002:a05:6402:1118:: with SMTP id u24mr15310846edv.229.1627846314210; Sun, 01 Aug 2021 12:31:54 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1627846314; cv=none; d=google.com; s=arc-20160816; b=w3+JcVcHtRSOBo7iIKtG69tkjelUNCb9zvdiVHTgcZYvRnE8bxrbIs2Iuvglm4PhkE 0oGCM+E91hNROBe6i33T7PoAt+wzxDFmUME8t6M7WTpBmscyGpJC8JzvRJtd/Rm9Eqas owcI+AjTnjkn2mTfUXfTFkcybDHcE5XEVLK1KqMn/JWBkQBu+cD2U1ucl6hT58o6r96l 7p25NOVF535ZldrKXpL/YwwL9uL52t3q4ZhiyzGjs4yp6utFzLgyji9L754SEPxvsT9p mQ+ueAj7cHWcqJxIF55qvOv/9vTKCMPNsKFTKOXJter/3omtItrauP63aZF8NNbdw8mk cYow== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:mime-version:reply-to :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:references:in-reply-to:message-id:date :to:from:delivered-to; bh=thRbvSz/3PdG0sj0TWmXj4jypUGFnPWIQeM9viqfBjw=; b=zw/QP6kx7hQurhwWCQcLFkkre8BcJvOWYLI7Uw8YPwlKlNWdMtdhELtN/yerUGMY60 qvyKZGRe4gQGmT1Xc8IA9yAQEWiTLT1dkM6LMll9ZRHvIIoHmlbwXBk5t9uHqv69L5yA OXbFB4vWJ8wcanR5lnw24ahGrBvP+E3y8iyzbX32BVWoEZdNQHidsn3tP2HhtrvG3aIy jyDam9yd9WyjElZ8fKVew7NOx/rSuKjNaa3/Qa6/389aTl19wDNEkbuC2WmYaK1qJ24O PB340YljRgKvN+y1P2Y1AMAohR+SNKmQso6GuE0GqbULYhSonrNGzxrVQyXAkgd6AA3z 2yLw== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id ca5si7905917edb.398.2021.08.01.12.31.53; Sun, 01 Aug 2021 12:31:54 -0700 (PDT) Received-SPF: pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) client-ip=79.124.17.100; Authentication-Results: mx.google.com; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id A952C68A62A; Sun, 1 Aug 2021 22:31:39 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from vie01a-dmta-pe02-1.mx.upcmail.net (vie01a-dmta-pe02-1.mx.upcmail.net [62.179.121.157]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id E8AF068A5AA for ; Sun, 1 Aug 2021 22:31:31 +0300 (EEST) Received: from [172.31.216.235] (helo=vie01a-pemc-psmtp-pe12.mail.upcmail.net) by vie01a-dmta-pe02.mx.upcmail.net with esmtp (Exim 4.92) (envelope-from ) id 1mAHBL-00DUsi-0K for ffmpeg-devel@ffmpeg.org; Sun, 01 Aug 2021 21:31:31 +0200 Received: from localhost ([213.47.68.29]) by vie01a-pemc-psmtp-pe12.mail.upcmail.net with ESMTP id AHANmc4XhljeHAHANm7e8x; Sun, 01 Aug 2021 21:30:31 +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=BoHjPrf5 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=mvMW0x_MyY3xAKUy-CoA:9 a=1fhp2MxaeJtTNGEnv6mo:22 From: Michael Niedermayer To: FFmpeg development discussions and patches Date: Sun, 1 Aug 2021 21:30:30 +0200 Message-Id: <20210801193031.4094-3-michael@niedermayer.cc> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20210801193031.4094-1-michael@niedermayer.cc> References: <20210801193031.4094-1-michael@niedermayer.cc> X-CMAE-Envelope: MS4wfAhp1IYljDfyAUEk9xsry5Mu13r2EERgwUKUjHzwtM4t453XMC3GSerNJopgez6HVfjb7jIuM4VfbWkA297g3mRNM7VTdXMf+soB2gsZHyGvs8PEwxxI lZ8R/uMxGRHLr48DumFr214+i5M0Zj28Prw7vaBQdm/fzqDfSt6GsEla Subject: [FFmpeg-devel] [PATCH 3/4] avformat/mpc8: Check first keyframe position for overflow X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.29 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" X-TUID: zMx1iPbtGBF0 Fixes: signed integer overflow: 9223372036854775791 + 18 cannot be represented in type 'long' Fixes: 36307/clusterfuzz-testcase-minimized-ffmpeg_dem_MPC8_fuzzer-4917863877050368 Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg Signed-off-by: Michael Niedermayer --- libavformat/mpc8.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/libavformat/mpc8.c b/libavformat/mpc8.c index df5d345f85..a0e661c2ab 100644 --- a/libavformat/mpc8.c +++ b/libavformat/mpc8.c @@ -177,7 +177,13 @@ static void mpc8_parse_seektable(AVFormatContext *s, int64_t off) } seekd = get_bits(&gb, 4); for(i = 0; i < 2; i++){ - pos = gb_get_v(&gb) + c->header_pos; + pos = gb_get_v(&gb); + if (av_sat_add64(pos, c->header_pos) != pos + (uint64_t)c->header_pos) { + av_free(buf); + return; + } + + pos += c->header_pos; ppos[1 - i] = pos; av_add_index_entry(s->streams[0], pos, i, 0, 0, AVINDEX_KEYFRAME); }