From patchwork Wed Aug 2 09:35:24 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: kobrineli X-Patchwork-Id: 43079 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:c11f:b0:130:ccc6:6c4b with SMTP id bh31csp526165pzb; Wed, 2 Aug 2023 02:35:44 -0700 (PDT) X-Google-Smtp-Source: APBJJlEru7LgjHSUgDRNUbGwlFeC+VivX9XydleVuJ4gCx0vv8hUuIe5C7VYfBh3XsK+sdj/HPYy X-Received: by 2002:a17:906:64c5:b0:99b:e04d:307d with SMTP id p5-20020a17090664c500b0099be04d307dmr4381697ejn.57.1690968944397; Wed, 02 Aug 2023 02:35:44 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1690968944; cv=none; d=google.com; s=arc-20160816; b=k9fJP4HfBD095mDFniLAqBuK5pRuRqoAxpSmdSbtf0pDn2JZY75Z+88VWDwf28E23R 9yyp1/cXPhCEMGa6U4ggqzEzeLg/q5wtbdSlLKQRmKM002LJ0op0y6cqzAjFd7bkVnUY ny3SNkSxO9AJfdOwVIWt3QRGF1qR9MhcsSyg1600zzLVl1WhaJ2rABnRxI4DWd4aaG1C jZDoKuPFfTmvN/hFBuvVlanltEmvAR7lQOSsG3U2sgW63YvrVpQEmccLfhKYBfwzjQ2R nXSzl/jCZNqFWBZLT+9RWvvJVYmpTI9JLcWGBTk/v5aVfNACSjZauMoZvzAh+cjhYgaA kPPQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:cc:reply-to :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:libswresample:mime-version:message-id :date:to:from:dkim-signature:dkim-filter:delivered-to; bh=VBJ6d+RDfNrrGZ5mt77NRV05BhT7XRGREJ3Tc7StDW4=; fh=ibdlRJL7hPsX7vyGZAgmrkUlV+OlDJERNwSvIOcS0Zs=; b=gB/WeyzBlZgcSoLlsSmtSS5cpc7sDtiVhf+pMBl5VIQSn1lpd+Tuw+9xD/MvSW+0Vb kQHOGq8Zyo9gYS+uqZ8eTHZ1D4NWuAuaVYhNOKefSzYjko5wuxd8N4bzG7ES+WN7fOSE vpMbNK+Z0eR1vU+WxG7VKslBIMebXaJtLWoTVS1i3/1on+d3FhxA2ATEsChi261Zhu7A YU1xVUzUEoaU5xDe2GNK3G7NlW9alHOWE5/loP7PpCka+NH6S6hRoadZZq5R9WN8EjIJ aTM+MjlAzb/GwtOfwdW7Lt9VVk4VY5cunCeyE9gwxJs7+/ItqH+4HJcn21DDHVzKhm1B IzLw== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@ispras.ru header.s=default header.b=ascd5jec; 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; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=ispras.ru Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id op16-20020a170906bcf000b009827e17b069si8926872ejb.1029.2023.08.02.02.35.43; Wed, 02 Aug 2023 02:35:44 -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=@ispras.ru header.s=default header.b=ascd5jec; 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; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=ispras.ru Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 311A068C59C; Wed, 2 Aug 2023 12:35:39 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org 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 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: JNm58hZZ3C1L 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;