From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by master.gitmailbox.com (Postfix) with ESMTP id EA48B4A171 for ; Fri, 22 Mar 2024 23:08:30 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 32D5668D4EB; Sat, 23 Mar 2024 01:08:27 +0200 (EET) 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 09B2068D4C7 for ; Sat, 23 Mar 2024 01:08:19 +0200 (EET) Received: by mail.gandi.net (Postfix) with ESMTPSA id 1BA11E0002 for ; Fri, 22 Mar 2024 23:08:18 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=niedermayer.cc; s=gm1; t=1711148899; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc; bh=LAvI25nNuzjBYqdstXHMEDVXcGCRYog9nB+F5j4mj4c=; b=NAVtwkoqg9s0QQZ7B8d7w+aVpiowTuZbE1y5x+EdJA4nHvOj+pmfxaMi1O4GUQOIsl/ib7 bhmFwb0gQ0jASq3eyXUXjXHJ6Iaqgf+ZUhTnrxUcAl2sGPWtyFd6f0brEpFiRIO7WFQmRc 96yNaL/37BreJjCw2Th1GZ7lrYTras8Pfz+mn6WLisnsOFOusW+7wEAsJk0U3tHo9NuqwH VDNjccyn4fUwZk8EQ+MUWF4VWFOfizu/52cSCR6s9TCpw5/sGtMLr//LqPCBrX6f+ZTJ6e xWXBD2JICYQCUuAOuuxMTfMY5NguqK5wDtoyw8mR6F51Xz7MqPpr2GWRlodvRw== From: Michael Niedermayer To: FFmpeg development discussions and patches Date: Sat, 23 Mar 2024 00:08:16 +0100 Message-Id: <20240322230818.18997-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/cafdec: sanity check channels and bps 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 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Archived-At: List-Archive: List-Post: Fixes: Timeout Fixes: 67044/clusterfuzz-testcase-minimized-ffmpeg_dem_CAF_fuzzer-5791144363491328 Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg Signed-off-by: Michael Niedermayer --- libavformat/cafdec.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/libavformat/cafdec.c b/libavformat/cafdec.c index 426c56b9bd..334077efb5 100644 --- a/libavformat/cafdec.c +++ b/libavformat/cafdec.c @@ -33,6 +33,7 @@ #include "isom.h" #include "mov_chan.h" #include "libavcodec/flac.h" +#include "libavcodec/internal.h" #include "libavutil/intreadwrite.h" #include "libavutil/intfloat.h" #include "libavutil/dict.h" @@ -87,6 +88,10 @@ static int read_desc_chunk(AVFormatContext *s) st->codecpar->ch_layout.nb_channels = avio_rb32(pb); st->codecpar->bits_per_coded_sample = avio_rb32(pb); + if (st->codecpar->ch_layout.nb_channels > FF_SANE_NB_CHANNELS || + st->codecpar->bits_per_coded_sample > 64) + return AVERROR_INVALIDDATA; + if (caf->bytes_per_packet < 0 || caf->frames_per_packet < 0 || st->codecpar->ch_layout.nb_channels < 0) return AVERROR_INVALIDDATA; -- 2.17.1 _______________________________________________ ffmpeg-devel mailing list ffmpeg-devel@ffmpeg.org https://ffmpeg.org/mailman/listinfo/ffmpeg-devel To unsubscribe, visit link above, or email ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".