From patchwork Wed Oct 11 18:10:13 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Niedermayer X-Patchwork-Id: 44227 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:4b22:b0:15d:8365:d4b8 with SMTP id fp34csp1081164pzb; Wed, 11 Oct 2023 11:10:41 -0700 (PDT) X-Google-Smtp-Source: AGHT+IHWo12NPpOYn2TmwAcJqJKEnJGikBgy7pNyGRtvfmbW2fI3SkYy6rOMmM/0wARMWOzp9NMu X-Received: by 2002:a17:907:d047:b0:9ae:6744:4591 with SMTP id vb7-20020a170907d04700b009ae67444591mr18094539ejc.43.1697047841094; Wed, 11 Oct 2023 11:10:41 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1697047841; cv=none; d=google.com; s=arc-20160816; b=aOkGqKpn2ME1iq3xmISViFs5+kr+yM4UhpiyRcx4GgNrZj/BGD3V6Pdws0k0J0uEc8 28dViVPkVB83MFZI45xBd0g/aMYVsXh/OvMGZ5nSm7W/OWwSM1sMmDQ7K2cqVUnpzNm3 iXwrHPR4nm7l39nBYLByOIslF8zGK/ipc5j3nq15ACodBuX0uHw87ihB1RKzrtD+zxw+ d4Mq7tbDpCXrFqnjth1ZRC5ZkublcotY81Z/a/7+SfbID1hmBrMZcBjAZDKti0ppSoKw iU/Etqx0xlYVrG7a8rplKIJtF/PSxYb8XQTaZ6PfrRnV/HsFL96VesoB9SdRF9L83KXQ kzVA== 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=0nukxeqJ2bDNb+ABo1/HHH7nm1fnuUx0usoj2udjY2o=; fh=e5zN9xSzcxLA6bGo3lF+CqTbY/oLwzApV03EO/RBfgQ=; b=bEvql1UZsRVmDtKeaLFcug00dNX7RvWG+zPRXQAfsmauZyxFT4RJoA+ynroYKmmr7H v+UHCnm2Vg2WkdqRqUffGSeeEmqfAwho8VymGCcgaRVRP02u8M9qPFWMNZR6H7ucnw1V plJhkXKd8KsJYUeazECqw2wrxbFSZZP4QESnOaYvDPSRSRKDZLzJoRpEg9Qif53QKIDp HG9Pm8hQhJbJfr92FEdiMo5kSuw9JouAhHpMVW6U5RIwCp5w/INpU34Z1MvnBhf4HrVK vuegUEpv2r38FgYJQEYhDSMfbfW/gzPsN7UvYl1q3xv/xyy+YZvLS9EgTQY/1Oj2OBbW 49Yw== 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 ga25-20020a1709070c1900b009ba1cf0f500si3908487ejc.871.2023.10.11.11.10.29; Wed, 11 Oct 2023 11:10:41 -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 61B9868C8E3; Wed, 11 Oct 2023 21:10:25 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from relay9-d.mail.gandi.net (relay9-d.mail.gandi.net [217.70.183.199]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 902CB68C835 for ; Wed, 11 Oct 2023 21:10:18 +0300 (EEST) Received: by mail.gandi.net (Postfix) with ESMTPSA id 929FCFF809 for ; Wed, 11 Oct 2023 18:10:16 +0000 (UTC) From: Michael Niedermayer To: FFmpeg development discussions and patches Date: Wed, 11 Oct 2023 20:10:13 +0200 Message-Id: <20231011181015.6433-1-michael@niedermayer.cc> X-Mailer: git-send-email 2.17.1 X-GND-Sasl: michael@niedermayer.cc Subject: [FFmpeg-devel] [PATCH 1/3] avformat/tmv: Check video chunk size 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: quA8FktKjx1s This check matches the audio chunk check Fixes: Timeout Fixes: 62681/clusterfuzz-testcase-minimized-ffmpeg_dem_TMV_fuzzer-5299107876700160 Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg Signed-off-by: Michael Niedermayer --- libavformat/tmv.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/libavformat/tmv.c b/libavformat/tmv.c index ea39954190..18105f764e 100644 --- a/libavformat/tmv.c +++ b/libavformat/tmv.c @@ -103,6 +103,10 @@ static int tmv_read_header(AVFormatContext *s) char_cols = avio_r8(pb); char_rows = avio_r8(pb); tmv->video_chunk_size = char_cols * char_rows * 2; + if (!tmv->video_chunk_size) { + av_log(s, AV_LOG_ERROR, "invalid video chunk size\n"); + return AVERROR_INVALIDDATA; + } features = avio_r8(pb); if (features & ~(TMV_PADDING | TMV_STEREO)) {