From patchwork Thu Aug 26 19:50:15 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Niedermayer X-Patchwork-Id: 29794 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6602:2a4a:0:0:0:0 with SMTP id k10csp799303iov; Thu, 26 Aug 2021 12:51:26 -0700 (PDT) X-Google-Smtp-Source: ABdhPJy9fEmtVVyrxzvyAZT/cqj7z7chFnwRk/ZQyEEMPMlaP6mK7S71aSRyRIR3A4ptsQsIN6zA X-Received: by 2002:a50:8dcd:: with SMTP id s13mr5909184edh.383.1630007486476; Thu, 26 Aug 2021 12:51:26 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1630007486; cv=none; d=google.com; s=arc-20160816; b=DYS0sSpgulhewsKSvBuWxvKuZ/7WuPGOjKDfbfYKzp9jcUnSeNeIn/ONboj6hIjkDA zG8sy8zaNGHl7X6hS9ppajvA2IWqN5sFcuNapcwBInVFYMX2Kd6RHx7aNqFrL1BA1TeA kf4N8aefaqQNJJM0L/ko5AraovmabvpRTrURc9PbH33t9uu1gUx2e7KdbXLjeNeONbcU X1OVsCWqAdheX3BV71lpqvJLIJosI5O7RdSbIUmOTDKvUH3uPRX36R4TLy9iVrw3fydh xqna3JgN8gqzaf4cfxeNf9Z1MkPpN0QwoMZ7qcYXYsMFwrWsnKAPDL8/S8Guic3PdwrH hBeA== 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:message-id:date:to:from:delivered-to; bh=VZCJxWFXpIepskuvHQkCsyAglZGOx38HyrOtiDYslNM=; b=HkZ6PbtFb+/P1iMqvgx/BtCtqe35X5YPGtuKjxOrlRgW+YHO1c9GjO/aw0AkKQ5MOj Xc7LwQ8LQvX/VTQAtHlQCbHVfYZEN6PQyDXaxLfeeMBwI2WUsKeV9+JeZ59AKFNMVMvd 4MJm1pQFfCjiVZ38R0eoJkF/CPmVYMvq/d2YLN/RDzivnZN35fMR7qOTuU6LfZYnvnxX hJ+KADvpU/MiLEd71MvuhgWqWuzVaLHnYhBCkhKgp+7Bl4+PIzp+tuBSdOzqDNHqH4qr K9drCqMFn+QwzY9SPqpMPZDNgeWwWWFYn+cNXs/43SxCMn6NuqVSmbCG9S9XQ9RXys3a Vybw== 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 p10si3562665ejo.13.2021.08.26.12.51.25; Thu, 26 Aug 2021 12:51:26 -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 D7C6468A1F0; Thu, 26 Aug 2021 22:51:22 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from vie01a-dmta-pe05-1.mx.upcmail.net (vie01a-dmta-pe05-1.mx.upcmail.net [84.116.36.11]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 712C9688178 for ; Thu, 26 Aug 2021 22:51:16 +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 1mJLPA-00EwOr-0E for ffmpeg-devel@ffmpeg.org; Thu, 26 Aug 2021 21:51:16 +0200 Received: from localhost ([213.47.68.29]) by vie01a-pemc-psmtp-pe12.mail.upcmail.net with ESMTP id JLOBmmug5ljeHJLOBmCmu6; Thu, 26 Aug 2021 21:50:16 +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=1XWaLZrsAAAA:8 a=qX5wZS9MHFB6eZLz2DQA:9 From: Michael Niedermayer To: FFmpeg development discussions and patches Date: Thu, 26 Aug 2021 21:50:15 +0200 Message-Id: <20210826195015.3327-1-michael@niedermayer.cc> X-Mailer: git-send-email 2.17.1 X-CMAE-Envelope: MS4wfE+z6AmInZ9+eA+/9LpxlxVYZv81aE6M4uvqsXdKeNHViwzjqGnRN2rGd7qygxgXJHqFy9ycvPPqkzLtg8spAfLghl4VEVzyCnqmcf8x6gjgbr+Emoui 5dx84/P7S2sX4txM98duiXuUUZ8Aj9Nlbc8qPhZO1Jad5a5zWnsAp1vu Subject: [FFmpeg-devel] [PATCH] avformat/mov: Check dts for overflow in mov_read_trun() 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: elfkRe/HruMo Fixes: signed integer overflow: 9223372034248226491 + 3275247799 cannot be represented in type 'long' Fixes: clusterfuzz-testcase-minimized-audio_decoder_fuzzer-4538729166077952 Reported-by: Matt Wolenetz Signed-off-by: Michael Niedermayer --- libavformat/mov.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/libavformat/mov.c b/libavformat/mov.c index da4c5d60f8..c5583e07c7 100644 --- a/libavformat/mov.c +++ b/libavformat/mov.c @@ -4953,6 +4953,8 @@ static int mov_read_trun(MOVContext *c, AVIOContext *pb, MOVAtom atom) "size %u, distance %d, keyframe %d\n", st->index, index_entry_pos, offset, dts, sample_size, distance, keyframe); distance++; + if (av_sat_add64(dts, sample_duration) != dts + (uint64_t)sample_duration) + return AVERROR_INVALIDDATA; dts += sample_duration; offset += sample_size; sc->data_size += sample_size;