From patchwork Tue Jun 8 19:29:40 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Niedermayer X-Patchwork-Id: 28177 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a5e:c91a:0:0:0:0:0 with SMTP id z26csp171956iol; Tue, 8 Jun 2021 12:36:29 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwVfDqfEL/9TZjjnw7DO2IZKklnTR/QTRd2fhHDTHbdJ6aEBpG/dGqht7mZJNAkqrnJezEG X-Received: by 2002:a17:906:919:: with SMTP id i25mr24254488ejd.171.1623180988990; Tue, 08 Jun 2021 12:36:28 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1623180988; cv=none; d=google.com; s=arc-20160816; b=eUczw0QGKrPJjfojLugMxscw7+hQ8aSFJyRQRNvhwtopJpv7k8EOvkwnEzU7K3nqBZ PGP+i08eJ4yvF5K7WsMkgVcrB2PbTuzi5K7Sbr576R9vf9FOXBaz3GPa584q16qN/hem j+vDyW6SAQLSfv/rEJnobSKGMwPYR52NpWfq4fikHvswxLCnkHkrG2JPsE8FFAvjYO37 ZGeSe5WI1XVCEfDXfKW6ZSDe4FSZbuW+cOfFN8vhb0aCK68hNktOKgaleljHjtwCKwmb kmLzGQfeND3UuXlr8UexTmWKhiWLZGfpq6PIlROOnOWt1IUf7X3K1wQ7033MQBd815lJ EGyA== 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=PNDF6ZkFOgTHeT8b2khXh8HnUqRwBkXtIydh35GU2r0=; b=bXgUbMzKH6VK4Gqzi4cr1T5jObdmr0WeE7X7sa9KoP2L/mJvDkI/4BoxSNUoH7D9Sx UuFyxJM7Avchz4bm5EMWixqIzwHZ+RnYn6JP7ab1aLtnGJps6t7ShCKdmBNtTaSYHI/y BqxWFVSvCidXD87UFHiyL61gBruOoyN8hxGfUhrb0q/UB5OywXEm1sQuZbSE8jDfSJ/Y wl0FbsE90Wwf6jhmTPjFCZF7sOSuTpyZ5m3EfRgigwEGUnxDvn3Ks6IDVV3uGqvYPott vXk+nk0Bi1iVjI49gVEIuC5xp+axbKCVh8b3DTUuDpUOvTZazQOf6jmrw+8TWTCoGs1w YF0Q== 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 h8si432901edj.149.2021.06.08.12.36.28; Tue, 08 Jun 2021 12:36:28 -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 618DE68052A; Tue, 8 Jun 2021 22:36:24 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from vie01a-dmta-pe03-2.mx.upcmail.net (vie01a-dmta-pe03-2.mx.upcmail.net [62.179.121.161]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id E9A3A68052A for ; Tue, 8 Jun 2021 22:36:17 +0300 (EEST) Received: from [172.31.216.235] (helo=vie01a-pemc-psmtp-pe12.mail.upcmail.net) by vie01a-dmta-pe03.mx.upcmail.net with esmtp (Exim 4.92) (envelope-from ) id 1lqhQw-00FDwv-0E for ffmpeg-devel@ffmpeg.org; Tue, 08 Jun 2021 21:30:42 +0200 Received: from localhost ([213.47.68.29]) by vie01a-pemc-psmtp-pe12.mail.upcmail.net with ESMTP id qhPylr3ThljeHqhPylDuLJ; Tue, 08 Jun 2021 21:29:42 +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=IPdSBf7DQicRio1emTYA:9 a=1fhp2MxaeJtTNGEnv6mo:22 a=Z5ABNNGmrOfJ6cZ5bIyy:22 a=SsAZrZ5W_gNWK9tOzrEV:22 From: Michael Niedermayer To: FFmpeg development discussions and patches Date: Tue, 8 Jun 2021 21:29:40 +0200 Message-Id: <20210608192941.15327-2-michael@niedermayer.cc> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20210608192941.15327-1-michael@niedermayer.cc> References: <20210608192941.15327-1-michael@niedermayer.cc> X-CMAE-Envelope: MS4wfP/QX5+Aw9VZu6B3VqvFc6vyNDiiIkwKLbqtW49Ne5cgG5CLWMiOB8S9djPlRxHVkPmAV+A0mR12sZGLRC+ycPp4NgaEkpjabPCCJ8dNQLXpzlEKVRAn HATSUA+8R58vh5sGvieLz+1NRA/se9UuD8rb9zil7hXrjrksenMf+m5B Subject: [FFmpeg-devel] [PATCH 2/3] avformat/mov: Check for duplicate mdcv 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: /15AqpGqzaUw Fixes: memleak Fixes: 34932/clusterfuzz-testcase-minimized-ffmpeg_dem_MOV_fuzzer-5456227658235904 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 6c99a67ff5..47a8e41236 100644 --- a/libavformat/mov.c +++ b/libavformat/mov.c @@ -5396,7 +5396,7 @@ static int mov_read_mdcv(MOVContext *c, AVIOContext *pb, MOVAtom atom) sc = c->fc->streams[c->fc->nb_streams - 1]->priv_data; - if (atom.size < 24) { + if (atom.size < 24 || sc->mastering) { av_log(c->fc, AV_LOG_ERROR, "Invalid Mastering Display Color Volume box\n"); return AVERROR_INVALIDDATA; }