From patchwork Wed Apr 28 15:06:35 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Niedermayer X-Patchwork-Id: 27462 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a11:4023:0:0:0:0 with SMTP id ky35csp508638pxb; Wed, 28 Apr 2021 08:07:51 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxwzGiCIro59VQeoOIlvDyBhxanYRJHJjIa5pjoKW1Tpj0WSTV5X8T+I0+Klp/7dIbnlBfi X-Received: by 2002:a17:906:7942:: with SMTP id l2mr29068977ejo.314.1619622469267; Wed, 28 Apr 2021 08:07:49 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1619622469; cv=none; d=google.com; s=arc-20160816; b=Y1WPriAPbKs42bE7jjh37+geFdBZoMs9J9OhjZN0sdmP6/QT4NZMRSqwp57sz+/4xf nmwZ2SbnFhk6dGEmNsmRgg4jtAttZR4OvbyYu9WL+QwkzuXVHQkHXs+T6sMAXDoyRT57 9xJnvTpEM179YGHdq/AcoTsl7BRJ74otMF7eoBkKdiMjcrOBJlrX/ttF6IqswPJXNfsX WoxqBPMWJ755ourxAFUlcbim3b09w0xYgbrSUCIxfvBnQBV/s/IynrG3tmqPcZXgrz1M DMANMEiCqdttzg9X6w8LncIv2tG9Ny6TjeTd9qrKS2wqqMdRuAy2Fs0ApPE9m5s8enYx vP+g== 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=j9jogPg020OlvhceSJzHb2dz4Rxno+Y54HcQfElswQ0=; b=g4q6DwQuHsvDJf8XVI4Mqt1GFpgjIwNf9YrMpPHYL5DyHjLoNyUKlxQQhvLtSTkhqB Nga5zm3IjrgFlqf5IUYv5iZgcfDT1dKR0pSvoe3glD7FNBJ88EGVldMGyciAFsHMaHe0 kxz8Q/sICPcGRYdY40ULTf3pJ3iHKOtQicFWn+8mrxXJezsW5aNPVAsIsJev2IDzrNfo gbOhjFdEI3WJzl0PhLWGe+XFbPvx93vcAubgJjyqYe2rzvVQrEgwADvaD5nSNlwnpPn4 WW6CIoXY5Cox9BxbnlVG0IKXB2QrwS46LeweRykszSMQ2twH4e3ZfeCIYDf+raTUqgY3 SX6A== 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 h16si6044725edv.460.2021.04.28.08.07.48; Wed, 28 Apr 2021 08:07:49 -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 2908968A1D4; Wed, 28 Apr 2021 18:07:44 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from vie01a-dmta-pe01-2.mx.upcmail.net (vie01a-dmta-pe01-2.mx.upcmail.net [62.179.121.155]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 77D7168924E for ; Wed, 28 Apr 2021 18:07:37 +0300 (EEST) Received: from [172.31.216.235] (helo=vie01a-pemc-psmtp-pe12.mail.upcmail.net) by vie01a-dmta-pe01.mx.upcmail.net with esmtp (Exim 4.92) (envelope-from ) id 1lblmr-00CrII-0B for ffmpeg-devel@ffmpeg.org; Wed, 28 Apr 2021 17:07:37 +0200 Received: from localhost ([213.47.68.29]) by vie01a-pemc-psmtp-pe12.mail.upcmail.net with ESMTP id blltlck7OljeHblltlNuiA; Wed, 28 Apr 2021 17:06:37 +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=tFWKVOVoM7f8wKKu_RwA:9 a=1fhp2MxaeJtTNGEnv6mo:22 a=Z5ABNNGmrOfJ6cZ5bIyy:22 a=SsAZrZ5W_gNWK9tOzrEV:22 From: Michael Niedermayer To: FFmpeg development discussions and patches Date: Wed, 28 Apr 2021 17:06:35 +0200 Message-Id: <20210428150636.28396-3-michael@niedermayer.cc> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20210428150636.28396-1-michael@niedermayer.cc> References: <20210428150636.28396-1-michael@niedermayer.cc> X-CMAE-Envelope: MS4wfCkT15dgI5d+RYQlfBR1KeVIhwGVO5a/CVN8/YA0tsNTcAmIVR9x1fhRoFGm3Znt32WvghgGJNmZbpZS3euICmyY1DJgJOeoXQaHHJIG8O2X1eFgrvrE raGiLklN6m89LHn2IBvSjlJpASHFZVvO4mmK7MTGirJyYtj2vDfO2VbB Subject: [FFmpeg-devel] [PATCH 3/4] avformat/mov: Fix incorrect overflow detection in mov_read_sidx() 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: 7sigXkPjGMKB Fixes: signed integer overflow: 9223372036854775807 + 1442840321 cannot be represented in type 'long' Fixes: 33670/clusterfuzz-testcase-minimized-ffmpeg_dem_MOV_fuzzer-6644379491106816 Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg Signed-off-by: Michael Niedermayer --- libavformat/mov.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavformat/mov.c b/libavformat/mov.c index ca8f06c4cd..0f94abd040 100644 --- a/libavformat/mov.c +++ b/libavformat/mov.c @@ -5080,7 +5080,7 @@ static int mov_read_sidx(MOVContext *c, AVIOContext *pb, MOVAtom atom) if (frag_stream_info) frag_stream_info->sidx_pts = timestamp; - if (av_sat_add64(offset, size) != offset + size || + if (av_sat_add64(offset, size) != offset + (uint64_t)size || av_sat_add64(pts, duration) != pts + (uint64_t)duration ) return AVERROR_INVALIDDATA;