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 8FA4F4A382 for ; Wed, 27 Mar 2024 09:42:43 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 104A168D62B; Wed, 27 Mar 2024 11:42:41 +0200 (EET) Received: from mail0.khirnov.net (red.khirnov.net [176.97.15.12]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 71B2268D1AB for ; Wed, 27 Mar 2024 11:42:34 +0200 (EET) Authentication-Results: mail0.khirnov.net; dkim=pass (2048-bit key; unprotected) header.d=khirnov.net header.i=@khirnov.net header.a=rsa-sha256 header.s=mail header.b=p3/aISW0; dkim-atps=neutral Received: from localhost (localhost [IPv6:::1]) by mail0.khirnov.net (Postfix) with ESMTP id D3FAD240DAC for ; Wed, 27 Mar 2024 10:42:33 +0100 (CET) Received: from mail0.khirnov.net ([IPv6:::1]) by localhost (mail0.khirnov.net [IPv6:::1]) (amavis, port 10024) with ESMTP id ALqEuclSbiI4 for ; Wed, 27 Mar 2024 10:42:31 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=khirnov.net; s=mail; t=1711532551; bh=osNDWjgEg5OYdo2dORQRzIcFJwoVSGiALHdsPPqbQuA=; h=Subject:From:To:In-Reply-To:References:Date:From; b=p3/aISW0+IJY4+w2ffcsIWtEoOFZvY2y8jVDlLvPgg7o15johsZY3tyV0C2BEWACH Yehg+skhFEQEIdLiz3Gm1H3VVHtArxxmpbJ5Hz3BPz1QAEo9NYJZiVA8IBBBfUoEdq 57JHMeSEcdXMgb8IWGq16hTC/GXVOcgEnPG/S5vOtfCeG28KwG+Nh+SxsZ4sf8glOK PGKGJq3cMnJlIH/blVaEM8ahPH7Xejmh6IbEXas+DkSnT7FvFLdJy5dQWOmO9yFuhZ c4P3A2i6luEt0yemdcl15SUEmn4NFMS8/RUodUamjNJRY2XkoDF6D2lPz4iQGqbCsW lN/+UhRS9bRKQ== Received: from lain.khirnov.net (lain.khirnov.net [IPv6:2001:67c:1138:4306::3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256 client-signature RSA-PSS (2048 bits) client-digest SHA256) (Client CN "lain.khirnov.net", Issuer "smtp.khirnov.net SMTP CA" (verified OK)) by mail0.khirnov.net (Postfix) with ESMTPS id 881942404AF for ; Wed, 27 Mar 2024 10:42:31 +0100 (CET) Received: by lain.khirnov.net (Postfix, from userid 1000) id 6567F1601B9; Wed, 27 Mar 2024 10:42:31 +0100 (CET) From: Anton Khirnov To: FFmpeg development discussions and patches In-Reply-To: <20240326001151.12083-7-michael@niedermayer.cc> References: <20240326001151.12083-1-michael@niedermayer.cc> <20240326001151.12083-7-michael@niedermayer.cc> Mail-Followup-To: FFmpeg development discussions and patches Date: Wed, 27 Mar 2024 10:42:31 +0100 Message-ID: <171153255139.7287.15957090514738342143@lain.khirnov.net> User-Agent: alot/0.8.1 MIME-Version: 1.0 Subject: Re: [FFmpeg-devel] [PATCH 07/10] avformat/wavdec: sanity check channels and bps before using them for block_align 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 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: Quoting Michael Niedermayer (2024-03-26 01:11:48) > Fixes: 62276/clusterfuzz-testcase-minimized-ffmpeg_dem_W64_fuzzer-4704044498944000 > Fixes: signed integer overflow: 520464 * 8224 cannot be represented in type 'int' > > Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg > Signed-off-by: Michael Niedermayer > --- > libavformat/wavdec.c | 5 ++++- > 1 file changed, 4 insertions(+), 1 deletion(-) > > diff --git a/libavformat/wavdec.c b/libavformat/wavdec.c > index 668c8adc36b..89855670d9c 100644 > --- a/libavformat/wavdec.c > +++ b/libavformat/wavdec.c > @@ -34,6 +34,7 @@ > #include "libavutil/log.h" > #include "libavutil/mathematics.h" > #include "libavutil/opt.h" > +#include "libavcodec/internal.h" > #include "avformat.h" > #include "avio.h" > #include "avio_internal.h" > @@ -908,7 +909,9 @@ static int w64_read_header(AVFormatContext *s) > if (ret < 0) > return ret; > avio_skip(pb, FFALIGN(size, INT64_C(8)) - size); > - if (st->codecpar->block_align) { > + if (st->codecpar->block_align && > + st->codecpar->ch_layout.nb_channels < FF_SANE_NB_CHANNELS && I objected to this approach. -- Anton Khirnov _______________________________________________ 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".