From patchwork Fri Dec 3 17:19:53 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Niedermayer X-Patchwork-Id: 31917 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:cd86:0:0:0:0:0 with SMTP id d128csp955247iog; Fri, 3 Dec 2021 09:21:11 -0800 (PST) X-Google-Smtp-Source: ABdhPJxd9Rx8Kj12nYV6UbY01YbLfqv+e+onE1d7cL8mGcSqMijiFvG4uwyCTgQyNrUP/mQewzxW X-Received: by 2002:a17:906:3408:: with SMTP id c8mr25092618ejb.41.1638552070960; Fri, 03 Dec 2021 09:21:10 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1638552070; cv=none; d=google.com; s=arc-20160816; b=NBanpNe1Lnt492vVslmsYlXIXJzBGor6CxM228qb9l+y0Yqt6ZftViNWzJqOl11jLU 8hijNZ/GY+E5kbYZfJm9PjRS5Q8FIzy3ssvxqUR4lN0x8htluF7rVZmeWn0q1OYjTFFd kWdk5fOa2t5x7xGMUISq2lHQUT/EC2jH2cz3f2DmeteC3kOQMSBhxVHZWzHX5+8j8/Hv lxD5lA++3zG8XPvrRjxzWRsFWY8thmqc0LYOWAqsQI5jUIS3r49Z/HqgLETAqvznZCKs dtINclq2u4OYAjFqmiCmwADxQurBc35IM3pE3MOcrOcsG1/hOuPVxRXJIblBTngNWwJv kS3w== 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=3SmHCmVna3gIayz7/VSbJqHPk17fen3sBX+u43esqLk=; b=NwHFdiDkvGHt3PFNds37z/Qb+1BppSERfoQwFbsoI+ob29Z55nr76JWsgtd+yNHrQU JrJvE0SPwwOXiAGbEtWREAlXdPIaiAXUSUetNoO3V+gc6TnXrTSwpUkYZ2bz8JJT9zSl ZQOHNQ9aGkc1eci7m4olX07dGHnIDZqUJC6qY5ifIFUNOuUd5c15aIo9NHxsMEWPXqcT 1vCKgVgip8ihVcOFI22vduc3W/2IBcM5aX68jOpoMIBQHX62knA1prEdZQssoXgQRQn7 IxIa5ioos7jwT8n6QR0q1hrh+vX5xAFGakAd/ikA5Xvqv0awnjkoh+LTSH4lr9KEvtze +6ZA== 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 ho36si5772027ejc.607.2021.12.03.09.21.08; Fri, 03 Dec 2021 09:21:10 -0800 (PST) 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 E222868ADDE; Fri, 3 Dec 2021 19:21:03 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from vie01a-dmta-pe05-2.mx.upcmail.net (vie01a-dmta-pe05-2.mx.upcmail.net [84.116.36.12]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 2782268A98D for ; Fri, 3 Dec 2021 19:20:57 +0200 (EET) 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 1mtCEy-00DjIv-05 for ffmpeg-devel@ffmpeg.org; Fri, 03 Dec 2021 18:20:56 +0100 Received: from localhost ([213.47.68.29]) by vie01a-pemc-psmtp-pe12.mail.upcmail.net with ESMTP id tCE0m7BgVSgGFtCE0mKbjw; Fri, 03 Dec 2021 18:19:56 +0100 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=f8Q2+96M 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=NEAV23lmAAAA:8 a=7vxmQ9Nlv0N70OH3X3sA:9 From: Michael Niedermayer To: FFmpeg development discussions and patches Date: Fri, 3 Dec 2021 18:19:53 +0100 Message-Id: <20211203171956.12231-1-michael@niedermayer.cc> X-Mailer: git-send-email 2.17.1 X-CMAE-Envelope: MS4wfCL8c5qX9THcgYxo58lyIfZMJMKvBtumH2Jxp/BsDwkxOPeHomHAJxxDMCdU08hhCQVuIHt0k19vpeQV1eCbCOSJtC16OqwhOOEQhlAb3iVMtoRLoldd 3O576UZL67+N1ke1qKdmIUWGY0ZuiH5P3nM2po2w2KZoA2NdFWD6bLY4 Subject: [FFmpeg-devel] [PATCH 1/4] avformat/mov: Disallow duplicate smdm 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: LVAbMN9cx76o Fixes: memleak Fixes: 39879/clusterfuzz-testcase-minimized-ffmpeg_dem_MOV_fuzzer-5327819907923968 Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg Signed-off-by: Michael Niedermayer --- libavformat/mov.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/libavformat/mov.c b/libavformat/mov.c index 5c74d099dae..e34453432d3 100644 --- a/libavformat/mov.c +++ b/libavformat/mov.c @@ -5405,6 +5405,9 @@ static int mov_read_smdm(MOVContext *c, AVIOContext *pb, MOVAtom atom) av_log(c->fc, AV_LOG_WARNING, "Unsupported Mastering Display Metadata box version %d\n", version); return 0; } + if (sc->mastering) + return AVERROR_INVALIDDATA; + avio_skip(pb, 3); /* flags */ sc->mastering = av_mastering_display_metadata_alloc();