From patchwork Sun Nov 7 13:31:31 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Niedermayer X-Patchwork-Id: 31320 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a5e:dc01:0:0:0:0:0 with SMTP id b1csp2525127iok; Sun, 7 Nov 2021 05:32:45 -0800 (PST) X-Google-Smtp-Source: ABdhPJyoW5qI0vvANCl+7P1FvO8EUArDTudrX6advmH5CJqsoaB+fUbBixHS0vEnGjbXWdpYdasJ X-Received: by 2002:a17:907:6e0b:: with SMTP id sd11mr28746040ejc.134.1636291964783; Sun, 07 Nov 2021 05:32:44 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1636291964; cv=none; d=google.com; s=arc-20160816; b=p8nvWA++SZsrEKj7gFT/SF5Ap3JyRqZy7PMsbo8zmDkEgTGsIBV4ZnKvK8GI345zgY yBmIVrkspP+mDQZ5aqSKRRDwwH85wLszyi6jUQzFicDuyDlh1XQJ1RokdCkUU12vE4// G759tg4PXG4yC4po2BlD0SYYU3atEIrkT4m9xsRPqlB4BcWj3e1TYRYs4ZE/CWiOEGu8 QsKJXfdnwYbOa2iPFTfQSUpxlGUxuANI1G8yZphGUdgZ68zp6fCgTaMjjesbIIM5fKEM mR6nYBIMxvrKGmTS49YT1lu2PfUezcdHg8gx2f252wG3AlBbFKvYSUX+AZ3bfJobE1nZ kGEA== 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=GRDFbC0KpyIguyiTIeyGSRenPckUP/P3Hx9W+vCK0yo=; b=VvRRc1mZr0paVawAAhRaaBaGpywzW5102yp1hYRyeqHYj7GN7qjzH45OQ82MnGzyXL xmB3Y8HewBImqAKlg2RkTmpPBIOkzKKVkbKnfFvRiYN7pRQBp+Uga9M18PeJUPeS8bVw x7O/YLdHhq2l/8QymZ0mdOPrDNjc3lRFMmP1sMIu6d+sQRdWIxdYfoUASgeW74jr2LwX eDdq6Z6Q4AaYN/CcjjY4jTZkRSDjbbeFVlITro9/xvv8TkeA3+Gre3nRDiy5T1giRT43 Xp/v7YA9+mwk2ujjZMeujXWMCzEDns+hDmHTIq7v+JDjz5hcL4exXHJT8F0odf3O9LKF Yr5w== 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 ds20si26378203ejc.535.2021.11.07.05.32.43; Sun, 07 Nov 2021 05:32:44 -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 C5373689C24; Sun, 7 Nov 2021 15:32:39 +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 15AFA689C24 for ; Sun, 7 Nov 2021 15:32:33 +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 1mjiHf-005Eko-07 for ffmpeg-devel@ffmpeg.org; Sun, 07 Nov 2021 14:32:31 +0100 Received: from localhost ([213.47.68.29]) by vie01a-pemc-psmtp-pe12.mail.upcmail.net with ESMTP id jiGhmHtuGSgGFjiGhm9W5I; Sun, 07 Nov 2021 14:31:31 +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=S6GGmhCsd1O2PKJQTzEA:9 From: Michael Niedermayer To: FFmpeg development discussions and patches Date: Sun, 7 Nov 2021 14:31:31 +0100 Message-Id: <20211107133131.10224-1-michael@niedermayer.cc> X-Mailer: git-send-email 2.17.1 X-CMAE-Envelope: MS4wfNyRmex5pYDa6QSUKUXpKqNnMzKKOrIbqxtCzd1t2wjnOt+iohkNMHwG2TboWdZMLs9c0zjxfz4TtkD9PjmwN5FftGy8hDAg85/OkqdbFmr4hmp/I1Ud XIgTGBvyAu1+tvaxv19YVVkrSpk+THqeUpKqp0Z9/n7/7Ob6gm5rudfX Subject: [FFmpeg-devel] [PATCH] avformat/mov: Check channels for mov_parse_stsd_audio() 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: UK34h2VgFZ/R Fixes: signed integer overflow: -776522110086937600 * 16 cannot be represented in type 'long' Fixes: 40563/clusterfuzz-testcase-minimized-ffmpeg_dem_MOV_fuzzer-6644829447127040 Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg Signed-off-by: Michael Niedermayer --- libavformat/mov.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/libavformat/mov.c b/libavformat/mov.c index 8a910a3165f..8e85013a235 100644 --- a/libavformat/mov.c +++ b/libavformat/mov.c @@ -2538,6 +2538,10 @@ int ff_mov_read_stsd_entries(MOVContext *c, AVIOContext *pb, int entries) av_log(c->fc, AV_LOG_ERROR, "Invalid sample rate %d\n", st->codecpar->sample_rate); return AVERROR_INVALIDDATA; } + if (st->codecpar->channels < 0) { + av_log(c->fc, AV_LOG_ERROR, "Invalid channels %d\n", st->codecpar->channels); + return AVERROR_INVALIDDATA; + } } else if (st->codecpar->codec_type==AVMEDIA_TYPE_SUBTITLE){ mov_parse_stsd_subtitle(c, pb, st, sc, size - (avio_tell(pb) - start_pos));