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 A4DD446A08 for ; Wed, 2 Aug 2023 09:35:41 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id DF82D68C58E; Wed, 2 Aug 2023 12:35:38 +0300 (EEST) Received: from mail.ispras.ru (mail.ispras.ru [83.149.199.84]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 2405468BE58 for ; Wed, 2 Aug 2023 12:35:33 +0300 (EEST) Received: from madara.intra.ispras.ru (unknown [10.10.34.59]) by mail.ispras.ru (Postfix) with ESMTPSA id 2798340F1DD3; Wed, 2 Aug 2023 09:35:32 +0000 (UTC) DKIM-Filter: OpenDKIM Filter v2.11.0 mail.ispras.ru 2798340F1DD3 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ispras.ru; s=default; t=1690968932; bh=AAu6p6lRcaGiQyfSjN9PkaudWbxHntPGFuNY64mDB6c=; h=From:To:Cc:Subject:Date:From; b=ascd5jec7G29Xd3fSv6cPu2l4VnaFXLD8jVYmmWKQ+IT301e9ugHRx3Y/X7nTOHgR 2wiLqgTFMIdYnZLrILHbZ6OeehgD/G0Ln56te7xDESQAXkVeAR53C5jwCRenlWC61q E4yr9nLXmE3LKnf/oDEQxwBNm0grr9RK8eY/VIlQ= From: kobrineli To: ffmpeg-devel@ffmpeg.org Date: Wed, 2 Aug 2023 12:35:24 +0300 Message-Id: <20230802093524.1136658-1-kobrineli@ispras.ru> X-Mailer: git-send-email 2.25.1 MIME-Version: 1.0 libswresample: Prevent out of bounds Subject: [FFmpeg-devel] [PATCH] libswresample: Prevent out of bounds. 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 Cc: Eli Kobrin 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: From: Eli Kobrin We've been fuzzing torchvision with [sydr-fuzz](https://github.com/ispras/oss-sydr-fuzz) and found out of bounds error in ffmpeg project at audioconvert.c:51. To prevent error we need to insert corresponding check. Signed-off-by: Eli Kobrin --- libswresample/audioconvert.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/libswresample/audioconvert.c b/libswresample/audioconvert.c index 1d75ba1495..701f4808a0 100644 --- a/libswresample/audioconvert.c +++ b/libswresample/audioconvert.c @@ -148,7 +148,12 @@ AudioConvert *swri_audio_convert_alloc(enum AVSampleFormat out_fmt, int flags) { AudioConvert *ctx; - conv_func_type *f = fmt_pair_to_conv_functions[av_get_packed_sample_fmt(out_fmt) + AV_SAMPLE_FMT_NB*av_get_packed_sample_fmt(in_fmt)]; + + size_t idx = av_get_packed_sample_fmt(out_fmt) + AV_SAMPLE_FMT_NB * av_get_packed_sample_fmt(in_fmt); + if (idx >= AV_SAMPLE_FMT_NB * AV_SAMPLE_FMT_NB) + return NULL; + + conv_func_type *f = fmt_pair_to_conv_functions[idx]; if (!f) return NULL; -- 2.25.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".