From patchwork Mon Jun 13 00:10:20 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Niedermayer X-Patchwork-Id: 36190 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:1a22:b0:84:42e0:ad30 with SMTP id cj34csp222923pzb; Sun, 12 Jun 2022 17:11:31 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzldFO10/5VHGqlrxx8tovQtxTf+Stq3jfKHCw27C77RejLTaR8moGHNt537k03xa8mQS3L X-Received: by 2002:a05:6402:50:b0:431:69fc:eff4 with SMTP id f16-20020a056402005000b0043169fceff4mr38804979edu.243.1655079091067; Sun, 12 Jun 2022 17:11:31 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1655079091; cv=none; d=google.com; s=arc-20160816; b=MOu7V63Q3TbQO6ZZe7v6Qdy59/+WltKXyNKiAy1Q5GAmWAEOyl1Li4U09zv2TR0D1T YVfVrzzXCgzLNVu4EY/LgZ+zU9vzEGR/V6ww8rh0WMEdvzXtoSExqc1U7q2gcgUIZWsE kPoVjI/j3w73Xpci3IA8ugPgkXaBGcUJuwI3jnazPIi3LWGZPk7geneBuUhqutg7v6Hc ozMyRnVLST4gMmrHbFD6wd/xeolg5xRVAzUtkJM17CmPo+NnbpmNcT9BRjHOqyznPgQH W8KwQjGpV+q1gt3INrnoz4J/P4+CQoQZGUX/WspqPCKQux0T3OhuXyWqLxQdvM7cCbZE gAHA== 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=UluZRSjKIe6oIlLXApFrKJ11jfTSwm1gak9VaPjgnEQ=; b=Nu6tU3Rs3gbt6TDoGDI4dcUEtXAfSh+Grd/gVeosamzG7NkeavpLUmY3vlXvIKXj/M wSYWckdnlKhBudmHmRuGeUKbAGdo6SX5xbP+RwHiAA9L2sOx3WfX+wd2cE4XbMgfy3sU yHm+xBnwAG3dBnXivq8zePAosCbFpDTLbqZ9sbmKr91mnpq3mjLSbAb9iCQUOiE+m/gM 6+qKoAXnTRlV80EQ79gzl9PVAhynxa+OhJ3TRueyaU2761nZqzB9LE+GpfeU6xOmHlvL DmGDcUdTqvsZ6jMrmtHuH75NgFnh3mhOqmdlQBFS8tfqTgfO/D1mNgnmQfWAmOaH2yZL EGZA== 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 e9-20020a170906648900b0071204f98119si5570459ejm.77.2022.06.12.17.11.30; Sun, 12 Jun 2022 17:11:31 -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 E1B1368B523; Mon, 13 Jun 2022 03:11:28 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from vie01a-dmta-at01-3.mx.upcmail.net (vie01a-dmta-at01-3.mx.upcmail.net [62.179.121.147]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 67C1F68A56F for ; Mon, 13 Jun 2022 03:11:22 +0300 (EEST) Received: from [172.31.216.235] (helo=vie01a-pemc-psmtp-pe12.mail.upcmail.net) by vie01a-dmta-at01.mx.upcmail.net with esmtp (Exim 4.92) (envelope-from ) id 1o0Xfu-0012d9-13 for ffmpeg-devel@ffmpeg.org; Mon, 13 Jun 2022 02:11:22 +0200 Received: from ren-mail-psmtp-mg02. ([80.109.253.241]) by vie01a-pemc-psmtp-pe12.mail.upcmail.net with ESMTP id 0XbwoecXL8s8U0XfuoKLvi; Mon, 13 Jun 2022 02:11:22 +0200 Received: from localhost ([213.47.68.29]) by ren-mail-psmtp-mg02. with ESMTP id 0XewozJAB8eSW0XewoM9qM; Mon, 13 Jun 2022 02:10:22 +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=KKE5sHJo c=1 sm=1 tr=0 ts=62a6806e a=2hcxjKEKjp0CzLx6oWAm4g==:117 a=2hcxjKEKjp0CzLx6oWAm4g==:17 a=MKtGQD3n3ToA:10 a=1oJP67jkp3AA:10 a=GEAsPZ9sns4A:10 a=NEAV23lmAAAA:8 a=PBlzMNIDDPxE7l9iKnMA:9 From: Michael Niedermayer To: FFmpeg development discussions and patches Date: Mon, 13 Jun 2022 02:10:20 +0200 Message-Id: <20220613001021.8065-2-michael@niedermayer.cc> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20220613001021.8065-1-michael@niedermayer.cc> References: <20220613001021.8065-1-michael@niedermayer.cc> X-CMAE-Envelope: MS4wfAlCOeS6TkB11m5d0JZQvX/6RNO56fpWOYHmGy7/v6IowELrQ5syM3gxwzxcW3yV2V4zzc1JhZDF6JVF5015h7q0N89ncTG7Sbw0DKHSabi1MWhZAdZL XH2/m5Wz8Oig5VblZHR7eBDjHP8ki0TDhr+EpdGmEedb/esueenkHjX7x6LM9Ddw7RJ1peBIHt5c5g== Subject: [FFmpeg-devel] [PATCH 2/3] avformat/mov: Check the item count in iloc better 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: ssuDICS522EN Fixes: out of array access Fixes: 47899/clusterfuzz-testcase-minimized-ffmpeg_IO_DEMUXER_fuzzer-5706852010164224 Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg Signed-off-by: Michael Niedermayer --- libavformat/mov.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/libavformat/mov.c b/libavformat/mov.c index fa471c45ea..3f7b0e3ed1 100644 --- a/libavformat/mov.c +++ b/libavformat/mov.c @@ -7501,12 +7501,12 @@ static int mov_read_iloc(MOVContext *c, AVIOContext *pb, MOVAtom atom) return AVERROR_PATCHWELCOME; } item_count = (version < 2) ? avio_rb16(pb) : avio_rb32(pb); - if (item_count > 1) { + if (item_count != 1) { // For still AVIF images, we only support one item. Second item will // generally be found for AVIF images with alpha channel. We don't // support them as of now. - av_log(c->fc, AV_LOG_ERROR, "iloc: item_count > 1 not supported.\n"); - return AVERROR_PATCHWELCOME; + av_log(c->fc, AV_LOG_ERROR, "iloc: item_count != 1 not supported.\n"); + return item_count ? AVERROR_PATCHWELCOME : AVERROR_INVALIDDATA; } // Populate the necessary fields used by mov_build_index.