From patchwork Sun Dec 5 21:19:04 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Niedermayer X-Patchwork-Id: 32080 Delivered-To: andriy.gelman@gmail.com Received: by 2002:a0c:cdc3:0:0:0:0:0 with SMTP id a3csp5145693qvn; Sun, 5 Dec 2021 13:20:29 -0800 (PST) X-Google-Smtp-Source: ABdhPJyM1GM7XIKtYKfA2kxtvOAKMPyAfHe4nzEahZljA3oyTe0Pfuux7RfsLSLf4nlS3es32Lrk X-Received: by 2002:a17:906:f44:: with SMTP id h4mr42438467ejj.113.1638739229661; Sun, 05 Dec 2021 13:20:29 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1638739229; cv=none; d=google.com; s=arc-20160816; b=G5CHWAGQZFOu8mv3ec0DRe4PYEBOxAPQZ9jqvG2Dpjyg9M4StCO7n1CiJsR1CXGG5I XFJTniWULFDNGSjFyS4WvT3ajc7bCW7gXekVv6lMn4wWbVyvWueUAbgrtYpWXA+Zyk5i f8MSaSJdwGMDk2SL41UZ5gX1/SkrLTBHns0pDpfoXI/bdBwPwf4re4JTc/zWX+GTMzio wddu0CTR+5s9wPtFoVRQ2h5mIk4+Vx/ipsr8eZOmAMi/THZyytP3EdUpUovzmt1zVGLp Mjk8iju8QVEWuYD91uB+odEvNtUNbghY/JS3Ke/ju/FjjPhWijj1Dfd/eRIpMD70aoPe vOzw== 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=hCw/Rmunxj2/9lkJCCd2tlAz3cZSHALTZQ5IyzZJ6Dg=; b=ajU7N+tObUJOP4mIjQaiZdszt0ybbpV0zwzLaQRB/xDT2ocmOCf8fofF7g5C9pGY5J jRoul0q3N1lHK8SPSjvUZyFktyBn2c2NM6HPlPdoFEPry8zK269hUESyEWHW3lw3JRfS W3FlXKPgmbaoVCCv1fe+bXq6k+k5yz6j4ZMT1WvpXkviHGJYyt0doMRme6rojH4wN9Vd 3QEQprXwjTlhqq2PUGU3TJTzn//uODKYZ7dV2hu/zxiNtQoFY09rKumwmMv6BnFnMm/k P3O2qCIMB9eURXCCP1CMUhQYXssLIxloZ4VpAxuLF18HpAfbwA98OF6ADnGBEKlWEqvn 9/lg== 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 y8si18619890edd.474.2021.12.05.13.20.29; Sun, 05 Dec 2021 13:20:29 -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 3324868A774; Sun, 5 Dec 2021 23:20:17 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from vie01a-dmta-pe02-2.mx.upcmail.net (vie01a-dmta-pe02-2.mx.upcmail.net [62.179.121.158]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 72E6468AF51 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-pe02.mx.upcmail.net with esmtp (Exim 4.92) (envelope-from ) id 1mtyvZ-002iU9-0N 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 tyuam2RQBSgGFtyubmZqRR; 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=rRB_DZY_UDNlg9q7E3EA:9 From: Michael Niedermayer To: FFmpeg development discussions and patches Date: Sun, 5 Dec 2021 22:19:04 +0100 Message-Id: <20211205211907.30010-4-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 4/7] avformat/4xm: Consider max_streams on reallocating tracks 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: Hjh01v4We8Oj Content-Length: 1161 Fixes: OOM Fixes: 41595/clusterfuzz-testcase-minimized-ffmpeg_dem_FOURXM_fuzzer-6355979363549184 Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg Signed-off-by: Michael Niedermayer --- libavformat/4xm.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/libavformat/4xm.c b/libavformat/4xm.c index f918b1fc572..5cbae7053d8 100644 --- a/libavformat/4xm.c +++ b/libavformat/4xm.c @@ -137,7 +137,8 @@ static int parse_strk(AVFormatContext *s, return AVERROR_INVALIDDATA; track = AV_RL32(buf + 8); - if ((unsigned)track >= UINT_MAX / sizeof(AudioTrack) - 1) { + if ((unsigned)track >= UINT_MAX / sizeof(AudioTrack) - 1 || + s->max_streams && track >= s->max_streams) { av_log(s, AV_LOG_ERROR, "current_track too large\n"); return AVERROR_INVALIDDATA; }