From patchwork Sun Dec 5 21:19:05 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Niedermayer X-Patchwork-Id: 32083 Delivered-To: andriy.gelman@gmail.com Received: by 2002:a0c:cdc3:0:0:0:0:0 with SMTP id a3csp5145853qvn; Sun, 5 Dec 2021 13:20:41 -0800 (PST) X-Google-Smtp-Source: ABdhPJz9Piv2uSHjEO/lFAH8zZp2wcetcdc2eUUfgn1XJuLC4uK3cMi8FF1E/egBOAA7jTkoN9Pz X-Received: by 2002:a17:906:fcb0:: with SMTP id qw16mr38511375ejb.495.1638739241431; Sun, 05 Dec 2021 13:20:41 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1638739241; cv=none; d=google.com; s=arc-20160816; b=FjygXaMoaRcvSSENq1YMASoYSMilGAGSvN1YLIdUiRWW1hLcgLeJli9NGDPSrMz5xq SHk3E/hHq6FgfTtIGM1UuDnr81mL56lusGvkE6QziVGSuKdSFW407GEAmM3PG9gwfZRF X+lHblMvGuIk96Vy/xJMIQJdLW1xQv4yxwvmOI0ccbcmjanlISUJw1SPZy/vOXG+05Xw epay5N++YKcAZKuIcxl0qlwxVzQ8uhtQgeClPThQmeWykch44gtY6UqBM2X31B/RUJqb YlXzl7OmQqCv4YxBQb2Mr7QBD6NK/vqxiUgIE3IE/gPfaK3MntwQTwPdh9dLLu4dKE27 r8KQ== 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=9OQFqw5+Ey74RIyg33IasEATbyuM6+6SrYP0Ap2KGcU=; b=V1+W2Q5+tJG3re7/csPDZxitQeRnqPxsW84dmAHqQhkrMJvkMhuSVngWUr7vviu5WL kogzre8aIi+JM3JEJzqDZwd2d7GcJ505+waHM8rgpxiKANViyAp/qHAZiJmdKYKeoW3r GHfuF+XoFdtePegqadX/SvLqkBQNmzfq9QtV+j+BsS1IVXXossPT851nSE4kDkoA7pS/ lLHfBVOkWp5v0ciUxebQaUlMCWMYwNH1r2BzEc03I0OzZxXqKAoJKz9hpCxDqx7sQfTX i5kN96pt1QGao8/Md3V5p5ZPfgZcebVMolE+nK+Pbi/vHLAH4XaCICexVxAHcYOH6hTk LwbQ== 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 bm27si12960789edb.294.2021.12.05.13.20.41; Sun, 05 Dec 2021 13:20:41 -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 B3EE368AFB3; Sun, 5 Dec 2021 23:20:18 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from vie01a-dmta-pe05-3.mx.upcmail.net (vie01a-dmta-pe05-3.mx.upcmail.net [84.116.36.13]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 747F068AF7B for ; Sun, 5 Dec 2021 23:20:09 +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 1mtyvZ-002Lso-0M for ffmpeg-devel@ffmpeg.org; Sun, 05 Dec 2021 22:20:09 +0100 Received: from localhost ([213.47.68.29]) by vie01a-pemc-psmtp-pe12.mail.upcmail.net with ESMTP id tyubm2RQySgGFtyubmZqRj; Sun, 05 Dec 2021 22:19:09 +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=V7WDoyOxxKVwJsqkHRsA:9 From: Michael Niedermayer To: FFmpeg development discussions and patches Date: Sun, 5 Dec 2021 22:19:05 +0100 Message-Id: <20211205211907.30010-5-michael@niedermayer.cc> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20211205211907.30010-1-michael@niedermayer.cc> References: <20211205211907.30010-1-michael@niedermayer.cc> X-CMAE-Envelope: MS4wfM9bHoUqYy7fN1cmKb6p2j+CUh0x9J7iZ1o/ko8zes5HlHs3PMN0nlNYnyRWFEX7rc/6HFlbXWp5G7gdEJ+s3AfV6C+31IfoglQ0ezbg0fa4z4ako/+I rb+SGhCMwP4AVbXmF6rygjKL9l0BpVKIngVHsn8gEnnUM/dSo+gHEHlr Subject: [FFmpeg-devel] [PATCH 5/7] avformat/mxfdec: Check for duplicate mxf_read_index_entry_array() 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: fJHg4sOIJT9P Content-Length: 1028 Fixes: memleak Fixes: 41596/clusterfuzz-testcase-minimized-ffmpeg_dem_MXF_fuzzer-6439060204290048 Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg Signed-off-by: Michael Niedermayer --- libavformat/mxfdec.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/libavformat/mxfdec.c b/libavformat/mxfdec.c index c231c944c01..1d501982793 100644 --- a/libavformat/mxfdec.c +++ b/libavformat/mxfdec.c @@ -1111,6 +1111,9 @@ static int mxf_read_index_entry_array(AVIOContext *pb, MXFIndexTableSegment *seg { int i, length; + if (segment->temporal_offset_entries) + return AVERROR_INVALIDDATA; + segment->nb_index_entries = avio_rb32(pb); length = avio_rb32(pb);