From patchwork Tue Nov 30 19:59:35 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Niedermayer X-Patchwork-Id: 31854 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:d206:0:0:0:0:0 with SMTP id q6csp8153475iob; Tue, 30 Nov 2021 12:00:56 -0800 (PST) X-Google-Smtp-Source: ABdhPJy2LuTCwwrC+++FUpeu9zH0dk0OmNSNgvDUgTkLcrJiZ/ap/+O3sgTKeFza17xVKmDsdQOi X-Received: by 2002:a17:907:75f0:: with SMTP id jz16mr1415343ejc.77.1638302456637; Tue, 30 Nov 2021 12:00:56 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1638302456; cv=none; d=google.com; s=arc-20160816; b=al9sELT+Jl2hC2O8HM691+LXk/t1Q9goEW0aiGbCoOdbWOLqcsD1QbOPOv+i1RCriN UEmAiZSjZ80lKCFDujeHZncox8+Da+poNmw2WN/x3Hve371Qm6r+9IzIVw/lO8Hl15Ct LA55xHSajm90nLu6UR2tS/EhLCKfdFcxpNWWafouIsLYqNpgj+GkpM8lEgyJZHxEckWD L+QVgli/+2kJX6g7tFmtQxdcwCZDKr11+RANr8CpTAFG9Ijg2NCFA2xB2P4lvSLAZEHL BqkLRotf3Te5ORcpz9EilASDJ5W04Kk83hUfIXIlxQ+P5qe1xvUi8C0Z2Dej/L+N0wNq lC3A== 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:references:in-reply-to:message-id:date :to:from:delivered-to; bh=iVOAsKs+zgXYswvD12vfOmfj2P58sKM//nqsdC9Eu7s=; b=V3w+pyL4f0rHycNBIrSVR+pYINP5eKMnYm8ism3CoxW0SHigsbFW6mXKKh+hDCGPAg DrIcyi/85qkqVL4CuNbQ+yNjowRN4w+86tNLi6LKkuV0zBqMLDRCSQiow8rGrYy0NjcW LFO0YkCl+QvFQ5GxUIqDjpe0H8LrqbJQEEod0WFTM7NKbZFzXgqKiFROjfDEDbRfziA5 r9c7fW9KMmSB/bzypCT/Ctu7AVeqjc4IM+wB8yQggMMFGscXaU/Q3ed9xTxfqrHsXfz9 9glDB+9p8ejWx94u7ve+o07fhOlIn2iXVf7QC1MgtHU6dPIBPvyv3A9XaphRklWCZQW6 nxyA== 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 z20si30225559edc.405.2021.11.30.12.00.49; Tue, 30 Nov 2021 12:00:56 -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 1FCF868AE5A; Tue, 30 Nov 2021 22:00:44 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from vie01a-dmta-pe02-1.mx.upcmail.net (vie01a-dmta-pe02-1.mx.upcmail.net [62.179.121.157]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id C032D680BBB for ; Tue, 30 Nov 2021 22:00:37 +0200 (EET) Received: from [172.31.216.235] (helo=vie01a-pemc-psmtp-pe12.mail.upcmail.net) by vie01a-dmta-pe02.mx.upcmail.net with esmtp (Exim 4.92) (envelope-from ) id 1ms9Ir-00B8O7-1Y for ffmpeg-devel@ffmpeg.org; Tue, 30 Nov 2021 21:00:37 +0100 Received: from localhost ([213.47.68.29]) by vie01a-pemc-psmtp-pe12.mail.upcmail.net with ESMTP id s9HtmsUrdSgGFs9HtmyaF6; Tue, 30 Nov 2021 20:59:37 +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=hA1njm0uc7YzSFGLO4gA:9 From: Michael Niedermayer To: FFmpeg development discussions and patches Date: Tue, 30 Nov 2021 20:59:35 +0100 Message-Id: <20211130195935.29259-3-michael@niedermayer.cc> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20211130195935.29259-1-michael@niedermayer.cc> References: <20211130195935.29259-1-michael@niedermayer.cc> X-CMAE-Envelope: MS4wfL8p6BtTzec5g2c5M1KKg8atw/s4/WERNo/3iHsy/52ad4ADbt9Iwfc2VzyZZOc+Ke/kPQly2lIJAboTNFrTyf6kIX3P7OWcySd3mvqwg48hE9kh1OyX HlaBFP1LnGFifr6gET6T9iWkj40n1xUvmGBfJRfS8AHIvxnuEuAj2VJ+ Subject: [FFmpeg-devel] [PATCH 3/3] avcodec/speexdec: Avoid violating the vector_fmul_scalar() API 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: x4WXjuSxaCKL Fixes: out of array access Fixes: 40054/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_SPEEX_fuzzer-6713285764841472 Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg Signed-off-by: Michael Niedermayer --- libavcodec/speexdec.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/libavcodec/speexdec.c b/libavcodec/speexdec.c index e263d4c48ce..1c33607db27 100644 --- a/libavcodec/speexdec.c +++ b/libavcodec/speexdec.c @@ -1545,7 +1545,7 @@ static int speex_decode_frame(AVCodecContext *avctx, void *data, if ((ret = init_get_bits8(&s->gb, avpkt->data, buf_size)) < 0) return ret; - frame->nb_samples = s->frame_size * s->frames_per_packet; + frame->nb_samples = FFALIGN(s->frame_size * s->frames_per_packet, 4); if ((ret = ff_get_buffer(avctx, frame, 0)) < 0) return ret; @@ -1560,6 +1560,7 @@ static int speex_decode_frame(AVCodecContext *avctx, void *data, dst = (float *)frame->extended_data[0]; s->fdsp->vector_fmul_scalar(dst, dst, scale, frame->nb_samples * frame->channels); + frame->nb_samples = s->frame_size * s->frames_per_packet; *got_frame_ptr = 1;