From patchwork Sun Sep 18 17:13:59 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Niedermayer X-Patchwork-Id: 38017 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:3b1c:b0:96:9ee8:5cfd with SMTP id c28csp791387pzh; Sun, 18 Sep 2022 10:16:04 -0700 (PDT) X-Google-Smtp-Source: AMsMyM7XwGmAocc+cmGBRd4kNmxKmlQntDGi/RtCXGQz8YmcUEyrbbwI38lpgJJwRJEGC3t3WOMc X-Received: by 2002:a05:6402:4148:b0:440:cb9f:d10f with SMTP id x8-20020a056402414800b00440cb9fd10fmr12423139eda.77.1663521364179; Sun, 18 Sep 2022 10:16:04 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1663521364; cv=none; d=google.com; s=arc-20160816; b=rHcXzME47GCJgkdE8fBBmGd9wXItB2h7QIaZ2YTrj0ln0nsd4G/hx+I35OOqsNwxk2 +GCS/iMcDn/J4vRdHCecKUskGiCrhgw66hL3nz/NiPrGsdDd9SCMQ5BvFap1mFbBfQZR 5SMiLcmZKpTIr0G47cuc8JXln/IsRxOb1cEDs4F/zp3OUfQSmKd+Atm4mxtNVILcgSaf OztBYh2w1VtmtqThAzV304maStvF5gSSyS9qAlkBD+0KHNTfjw2awTdt775hEDrVgXW2 wbVTyg2tqrSE20KawPVWnj3TloxT3xSD0Gd7uMW7R1AmrotSiVcByyk2kH3hJ3rd2DVE M8Jg== 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=zqjCK1xJzH0gdTIroiRpIxKaW10TkY1TYvQnXvFb4c0=; b=xn8CnP4APIuCoh6TMt1uBmcZEif2J8n9jex+YFz6tlgzNi+NnRP0j2Z33bBV/VXtlq GxtoMUDvnscKToQKwE8HtoZnIHvg+XEKCrjparufNS9GgMOE4Z4WKZncW02JG4vsWUv1 14Keo09Wr4BycgGyE/F9CL+uThROjnPmryzB12WUFnrusQ4H3oKdIVm4oPuiP2GSkkRG FUqNHhdgDAOEaJX9106K6o1C4Z9e07pF0AQeJxpXmoh+Er0jhhAov74JZ3uCM0RPY543 9pfD0V32JUcupkbtCL2rlIwQfvZSawbvMj7sWHP71ccwcFGpt4NJzBxU2bYZ9mCqywVa 6D+Q== 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 y15-20020a17090629cf00b0072b7fac8a7asi17159541eje.926.2022.09.18.10.16.03; Sun, 18 Sep 2022 10:16:04 -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 2B51D68BB1F; Sun, 18 Sep 2022 20:15:13 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from vie01a-dmta-at03-1.mx.upcmail.net (vie01a-dmta-at03-1.mx.upcmail.net [62.179.121.151]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 8993C68BB21 for ; Sun, 18 Sep 2022 20:15:11 +0300 (EEST) Received: from [172.31.216.235] (helo=vie01a-pemc-psmtp-pe12.mail.upcmail.net) by vie01a-dmta-at03.mx.upcmail.net with esmtp (Exim 4.92) (envelope-from ) id 1oZxst-00EpF3-1Q for ffmpeg-devel@ffmpeg.org; Sun, 18 Sep 2022 19:15:11 +0200 Received: from ren-mail-psmtp-mg02. ([80.109.253.241]) by vie01a-pemc-psmtp-pe12.mail.upcmail.net with ESMTP id Zxstom1Ds8s8UZxstoH6FV; Sun, 18 Sep 2022 19:15:11 +0200 Received: from localhost ([213.47.68.29]) by ren-mail-psmtp-mg02. with ESMTP id Zxrvo4SsFbZLDZxrvoJKI9; Sun, 18 Sep 2022 19:14:11 +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.4 cv=Ufwy9IeN c=1 sm=1 tr=0 ts=632751e3 a=2hcxjKEKjp0CzLx6oWAm4g==:117 a=2hcxjKEKjp0CzLx6oWAm4g==:17 a=MKtGQD3n3ToA:10 a=1oJP67jkp3AA:10 a=GEAsPZ9sns4A:10 a=NEAV23lmAAAA:8 a=xURiMuJYthj9BTddSxYA:9 From: Michael Niedermayer To: FFmpeg development discussions and patches Date: Sun, 18 Sep 2022 19:13:59 +0200 Message-Id: <20220918171410.31835-2-michael@niedermayer.cc> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20220918171410.31835-1-michael@niedermayer.cc> References: <20220918171410.31835-1-michael@niedermayer.cc> X-CMAE-Envelope: MS4wfJY7KYYb9NRXgszn9WAqqDLXr88uk1tH09msjenO5WFr3+5Tit+4gg0XrJXlgewTAIHL1iJM1TQrf1Stprrwmil1RFwM94v7lojT2z2v+hlzGzEUWWJ6 hf6cUoPHBeYZj2co3CVQ3A25DIdCXqGn6PaiTabtgFixOWfIpPzBTbyG12EJ/UDPnlHLZeaiHYCkpw== Subject: [FFmpeg-devel] [PATCH 02/13] avformat/mxfdec: Check run_in to fit in int and be valid 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: O32jbZXNTfuR Fixes: signed integer overflow: 9223372036854775807 - -2146905566 cannot be represented in type 'long' Fixes: 50993/clusterfuzz-testcase-minimized-ffmpeg_dem_MXF_fuzzer-6570996594769920 Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg Signed-off-by: Michael Niedermayer --- libavformat/mxfdec.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/libavformat/mxfdec.c b/libavformat/mxfdec.c index e63e803aa56..da81fea3bc1 100644 --- a/libavformat/mxfdec.c +++ b/libavformat/mxfdec.c @@ -3681,6 +3681,7 @@ static int mxf_read_header(AVFormatContext *s) KLVPacket klv; int64_t essence_offset = 0; int ret; + int64_t run_in; mxf->last_forward_tell = INT64_MAX; @@ -3690,7 +3691,10 @@ static int mxf_read_header(AVFormatContext *s) } avio_seek(s->pb, -14, SEEK_CUR); mxf->fc = s; - mxf->run_in = avio_tell(s->pb); + run_in = avio_tell(s->pb); + if (run_in < 0 || run_in != (int)run_in) + return AVERROR_INVALIDDATA; + mxf->run_in = run_in; mxf_read_random_index_pack(s);