From patchwork Thu Sep 12 23:33:31 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Niedermayer X-Patchwork-Id: 51554 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a59:c541:0:b0:48e:c0f8:d0de with SMTP id f1csp424vqr; Thu, 12 Sep 2024 16:33:50 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCUBHac7vcHgrapkN13YSpHUTOYJ172c5kUOE6KMr5Y/LtPzqF96b1tw0gFG+G8M8X+bpJxDK/zcWu3AVUs4dgIi@gmail.com X-Google-Smtp-Source: AGHT+IFTPr7R/X4ksVENh4u9TYPQ+yAdCEL7RvuWKAGZwF1YWuUwxmRqpdjnRUv/+xd55tlcifhO X-Received: by 2002:a05:6402:51d4:b0:5c2:56d2:20b3 with SMTP id 4fb4d7f45d1cf-5c413e2359dmr3167736a12.21.1726184030432; Thu, 12 Sep 2024 16:33:50 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1726184030; cv=none; d=google.com; s=arc-20240605; b=lG/2cFN4GzGyx6C0+txwesThjCEqb1LwFUKZkEcsbxr9WzuQ9XSwu66VMl/KPyPg0o yl4ZxyCN/XySHdTCNz/lIUuRl1v1QGdRh5MjTSoy199+RmytUGAsd5u3zt0uj/E5lyAD tKteY7fnw0Bt1I8OU0YfBGS6v0u9PG+r1+WH+5qIcMNz/+AQUx5e0mhmATcLgJh5XHuM fNMBThWU5gwltC4lcRAqIBq9XslTcqrYaQvnQhrxY2co7uWsNtOsYACuKHlo2XrOm7aM sh4xPtXQgf8kY3xAqoDDXLMtU/Vh6qomejXtM1F32NWNKdxAoyM7kgcIIOHVW+AhO23p lfzg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20240605; h=sender:errors-to:content-transfer-encoding:reply-to:list-subscribe :list-help:list-post:list-archive:list-unsubscribe:list-id :precedence:subject:mime-version:message-id:date:to:from :dkim-signature:delivered-to; bh=LPFsEmF/qKJSjlG3UhZl3akICehEP0scO/CNhzAuWBQ=; fh=e5zN9xSzcxLA6bGo3lF+CqTbY/oLwzApV03EO/RBfgQ=; b=eE5jnkrCV8a/mHCseYtiQPp8fwZeojfj6HrLZQbye6XbNr9J3crXg4EVdkl6vXZq+N CipmVGZIYFGktG5YHQCAA4yDJWOiFhRr3FHRN3UQEPeY4IG9RElXMzTpY32vip53QEsU CZaa6hSbLx0GVvP/i5mN+6uUqZOVqUIAYYMVy1pxmJboZYhi7MbaiYQbZdD7DRAm3UYh 9l8V4jolel0HNBZQm8WQEVZVFoyIlT3xa6khmmPDSRAqzCjnGo9XC2wr0xABrT7Im1c6 JOqSqNf4gLIguCt/ceibMXn5xg1/CDI6/3gJHTJhT26xCvs2jhB4M/thVIM3b37iBuXJ ILWw==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@niedermayer.cc header.s=gm1 header.b=mCI98hDT; 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 4fb4d7f45d1cf-5c3ebd79ef1si9292470a12.234.2024.09.12.16.33.49; Thu, 12 Sep 2024 16:33:50 -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; dkim=neutral (body hash did not verify) header.i=@niedermayer.cc header.s=gm1 header.b=mCI98hDT; 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 6470468D657; Fri, 13 Sep 2024 02:33:45 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from relay4-d.mail.gandi.net (relay4-d.mail.gandi.net [217.70.183.196]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 2406A68CFA6 for ; Fri, 13 Sep 2024 02:33:39 +0300 (EEST) Received: by mail.gandi.net (Postfix) with ESMTPSA id 1D6FEE0002 for ; Thu, 12 Sep 2024 23:33:37 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=niedermayer.cc; s=gm1; t=1726184018; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding; bh=8pxxvQz3pZCIFnNDEAYQ40YV0glbBM6jlafO88P1A0E=; b=mCI98hDTGHhCvLFyx+3iJLGcCv5fXifl8wqpfIqNGAxwb2+M+WApFmjSueJd1HIa2d36i8 /Hkkq89qyyadq580wQwt7BICfAKJd29B5MbxvnH8U2tSKNx6MuuWfFx+Tl0PVW8w76APDV AF1rUM6v7y8IoBUhoMQGrNMLB37+uaHaUzGQ7s8WcBXH5/BaLJgcLalkeLgOpTl/kx3rZ5 Ul451dVb/3JJ3YC5TKWiJDvUmm4oh5Q2TPSHkx2dZeXaIWVav9n6wxAUOdxWcdLphv5+8v Y+ubytePHxRCprj5vl9SDrVjS5qnFafBxvjEbYI1+/Iv61zvoq5tAJ9DUVlMwQ== From: Michael Niedermayer To: FFmpeg development discussions and patches Date: Fri, 13 Sep 2024 01:33:31 +0200 Message-ID: <20240912233337.2444412-1-michael@niedermayer.cc> X-Mailer: git-send-email 2.46.0 MIME-Version: 1.0 X-GND-Sasl: michael@niedermayer.cc Subject: [FFmpeg-devel] [PATCH 1/7] avformat/mov_chan: Check for FF_SANE_NB_CHANNELS 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 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: 4o2QUzukxnPJ We do not support more channels. For example avcodec_open2() limits channels this way too The example file contains multiple chunks with over 16 million channels Fixes: Timeout / DOS Fixes: 67143/clusterfuzz-testcase-minimized-ffmpeg_dem_CAF_fuzzer-4858720481771520 Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg Signed-off-by: Michael Niedermayer --- libavformat/mov_chan.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/libavformat/mov_chan.c b/libavformat/mov_chan.c index cc5b3331290..2cc6b2a7797 100644 --- a/libavformat/mov_chan.c +++ b/libavformat/mov_chan.c @@ -30,6 +30,7 @@ #include "libavutil/channel_layout.h" #include "libavutil/mem.h" #include "libavcodec/codec_id.h" +#include "libavcodec/internal.h" #include "mov_chan.h" enum { @@ -549,6 +550,10 @@ int ff_mov_read_chan(AVFormatContext *s, AVIOContext *pb, AVStream *st, num_descr, nb_channels); num_descr = nb_channels; } + if (nb_channels > FF_SANE_NB_CHANNELS) { + ret = AVERROR(ENOTSUP); + goto out; + } av_channel_layout_uninit(ch_layout); ret = av_channel_layout_custom_init(ch_layout, nb_channels);