From patchwork Sun Dec 26 13:37:23 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Niedermayer X-Patchwork-Id: 32918 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:cd86:0:0:0:0:0 with SMTP id d128csp9556789iog; Sun, 26 Dec 2021 05:38:34 -0800 (PST) X-Google-Smtp-Source: ABdhPJzZbK73narVouZgHkTE7Vnm392OgDmcc/IGe1mUjdeh3ABT5npC5+VANCWCYbeeIa61aocQ X-Received: by 2002:aa7:dc14:: with SMTP id b20mr12427908edu.133.1640525914243; Sun, 26 Dec 2021 05:38:34 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1640525914; cv=none; d=google.com; s=arc-20160816; b=itcR0hHpIblbZmRVTP3jl4nl8qMNL0nz1i2a9JUcXonAryAF8QmG2RvjfUNf81SJhg v3o4wTV7mw02Z/Wlkk0OvD/3w76tstnCM+rLawWG+AAfoXOYBvPQn+Vspwo7lG9YZmKG KbrtZzN5Ox8N2/d4NZ2AHK28kmNVWI/wsE7rAZKTS+WCyqfvsxCiYckjG0QzoZEUS/AH RCs++XsUuUKJj3uFm3cx3oi/8VPWOTNEVBcLLpte3lVXcCWlg+dTDkZzRRx4eor1yadG sE5cYj5Zs8XWg3mRiEP1gw4GH0iWaFHzIXhBWs+o70FA2dXUaEftSUg4saYsYorV8mjK 4U0A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:mime-version:reply-to :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:message-id:date:to:from:delivered-to; bh=i2c9sgaMWb1r7Wb8/l+tECa9U0NZWoB3MYo8e6UhB1M=; b=OItlQrTzvFCyBqljoE5t6cTVbOeb2grZObGiZJakKl0vjfXhaKlf9XkM5MDI3N4tPR xs/cph7/pXhNlrgCI28LjLcbTfFvfpCSG7Qp117tumVlYfoA/QSVsDeRXlpXuxp+lbm2 /1PZZKgBspwuJbW7qVTflzEZy/iIG3yVxqJw5N/CYpURsub5JvtSjS8q1q/8XbCLigQc 6C3SAYUl0ZbHwsM6GRSNxZzA7fpkDEXVRMWPZRtmr51qgb58HNGQAs+UGutbNUBFRegz pxBHtPOM3aC8VYtrL7MYv45DwZB/5JmG17ipaP/2oV/Dn59O0lAQoK0qdu6RK/f78LrA lv4A== ARC-Authentication-Results: i=1; mx.google.com; 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 g9si6238804edt.162.2021.12.26.05.38.33; Sun, 26 Dec 2021 05:38:34 -0800 (PST) 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; 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 1C68268B121; Sun, 26 Dec 2021 15:38:31 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from vie01a-dmta-pe05-3.mx.upcmail.net (vie01a-dmta-pe05-3.mx.upcmail.net [84.116.36.13]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 9BE4268AEE9 for ; Sun, 26 Dec 2021 15:38:24 +0200 (EET) Received: from [172.31.216.235] (helo=vie01a-pemc-psmtp-pe12.mail.upcmail.net) by vie01a-dmta-pe05.mx.upcmail.net with esmtp (Exim 4.92) (envelope-from ) id 1n1TjE-000aVA-0C for ffmpeg-devel@ffmpeg.org; Sun, 26 Dec 2021 14:38:24 +0100 Received: from localhost ([213.47.68.29]) by vie01a-pemc-psmtp-pe12.mail.upcmail.net with ESMTP id 1TiFn3I9YSgGF1TiFnU804; Sun, 26 Dec 2021 14:37:24 +0100 X-Env-Mailfrom: michael@niedermayer.cc X-Env-Rcptto: ffmpeg-devel@ffmpeg.org X-SourceIP: 213.47.68.29 X-CNFS-Analysis: v=2.3 cv=f8Q2+96M c=1 sm=1 tr=0 a=2hcxjKEKjp0CzLx6oWAm4g==:117 a=2hcxjKEKjp0CzLx6oWAm4g==:17 a=MKtGQD3n3ToA:10 a=1oJP67jkp3AA:10 a=GEAsPZ9sns4A:10 a=ZZnuYtJkoWoA:10 a=NEAV23lmAAAA:8 a=YstIPMcqSNnaQRqN8WgA:9 From: Michael Niedermayer To: FFmpeg development discussions and patches Date: Sun, 26 Dec 2021 14:37:23 +0100 Message-Id: <20211226133723.575-1-michael@niedermayer.cc> X-Mailer: git-send-email 2.17.1 X-CMAE-Envelope: MS4wfOpSU7ZEAhRfBot6YPnfWwOLpvoHksWpPo0G5MitMYZzli1RlQIGMY6NejSVOBtaqBvxRFFJwVWIzbgKnRqFDkNhsA1AWZj+Oy2mwzpmq2KKl2Zq/eKv DU8hSO6Od5lCX9OnKOaB0GEv3Rh6rbdMyqX/vR2gdsICIAoHwdi9UzV9 Subject: [FFmpeg-devel] [PATCH] avcodec/speexdec: Consider mode in frame size check 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 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: 8XGBVxA1Wrmz No speex samples with non default frame sizes are known (to me) the official speexenc seems to only generate the 3 default ones. Thus it may be that the fuzzer samples where the first non default values encountered by the decoder. Possibly the "<" should be "!=" If someone has a valid speex file with non default frame sizes that would be interesting! Fixes: out of array access Fixes: 42821/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_SPEEX_fuzzer-5640695772217344 Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg Signed-off-by: Michael Niedermayer --- libavcodec/speexdec.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavcodec/speexdec.c b/libavcodec/speexdec.c index 1c33607db27..dcbdf5e010a 100644 --- a/libavcodec/speexdec.c +++ b/libavcodec/speexdec.c @@ -1419,7 +1419,7 @@ static int parse_speex_extradata(AVCodecContext *avctx, return AVERROR_INVALIDDATA; s->bitrate = bytestream_get_le32(&buf); s->frame_size = bytestream_get_le32(&buf); - if (s->frame_size < NB_FRAME_SIZE) + if (s->frame_size < NB_FRAME_SIZE << s->mode) return AVERROR_INVALIDDATA; s->vbr = bytestream_get_le32(&buf); s->frames_per_packet = bytestream_get_le32(&buf);