From patchwork Sun Apr 16 16:48:30 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Niedermayer X-Patchwork-Id: 41214 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:4645:b0:e3:3194:9d20 with SMTP id eb5csp1839326pzb; Sun, 16 Apr 2023 09:50:20 -0700 (PDT) X-Google-Smtp-Source: AKy350aCo+GZRHXQq/YfFlDZfm9UyXHGU1YgjJpnIqq6w3WaEp5njJxf924qDzajxQUeBviSIj3m X-Received: by 2002:a05:6402:1353:b0:500:46f2:e7db with SMTP id y19-20020a056402135300b0050046f2e7dbmr12342994edw.15.1681663820245; Sun, 16 Apr 2023 09:50:20 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1681663820; cv=none; d=google.com; s=arc-20160816; b=UKnAoD0sIg29uLN1zybVCY+SigefO0YHTWdjiMinkP3QbQ4YE2iBjmn/C5LIVhdeUW iZLWi6BT6pGgE9iFRzqS/roo3ZTiX8YehDS3Ugxi2n+MaDUON7sA/RhLeHLQQetiJxUT Eb4b44qEmWcJ/Z6D47Lz9YB6Av9gdzTGarY9TkCus982F0V1WlbcTLtdEjPE8Ow/6QGX 903ncZWnFEj2T3liV0MhOq8Gbbf1CDBLoo2HMYdUvW33DB0IFe/7bcJq/8HJNNv+nDoZ wZLfV8RdEu1wMXli1DMmSop+yRAa/2MhmX+SaYiJQ++M1rDueAJpt9dhb520gZlpFBor Cjxw== 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=2rd/FWkX9wtnKBYHdFgU3kKFKxyqvh4/pCZ1dtYOkRw=; b=BkRy3GNHSUNsSOrhW0IaOJtWR9CK5jzCT0cJGy95jf8wHz48X/ptDHRq9C8VC2BpMP AMkuO9c0auMPhDDuhlqxnntcBhahaK0MnwVNN9BxRGDGlFKJlN6WKI9ci9Fr3q1S0Ehk 5tSi0vltDGvbgfdFOcEtGjFA/lUxEOPOT3d6LTH/KpfhI7JrN3uUK72lyyFW9ErtUqSk r5t8js+YUdFMztyn7QTLXhhXuEurPdm4f5H/+JlIhvCR+dpeoNe/WrlJ29E7DlkmaTlP lk+iVNxZO0mPZyRu8UV/2P6DO7u7ien5q+2jjGWLXA/6HK3tPFOb/iPaFBJbBkVUvW8R pz1g== 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 fp6-20020a1709069e0600b0094f1a10c6c5si3433456ejc.894.2023.04.16.09.50.19; Sun, 16 Apr 2023 09:50:20 -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; 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 2C06D68BE77; Sun, 16 Apr 2023 19:48:59 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from relay5-d.mail.gandi.net (relay5-d.mail.gandi.net [217.70.183.197]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id EA21168BE67 for ; Sun, 16 Apr 2023 19:48:57 +0300 (EEST) Received: (Authenticated sender: michael@niedermayer.cc) by mail.gandi.net (Postfix) with ESMTPSA id 021411C0002 for ; Sun, 16 Apr 2023 16:48:56 +0000 (UTC) From: Michael Niedermayer To: FFmpeg development discussions and patches Date: Sun, 16 Apr 2023 18:48:30 +0200 Message-Id: <20230416164830.15664-11-michael@niedermayer.cc> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20230416164830.15664-1-michael@niedermayer.cc> References: <20230416164830.15664-1-michael@niedermayer.cc> Subject: [FFmpeg-devel] [PATCH 11/11] avcodec/wavarc: Check order before using it to write the list 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: x7Gh8H8S0Sb0 Fixes: out of array access Fixes: 45982/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_WAVARC_fuzzer-6247711015043072 Fixes: 45982/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_WAVARC_fuzzer-6487578428964864 Fixes: 45982/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_WAVARC_fuzzer-6651587794960384 Fixes: 45982/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_WAVARC_fuzzer-6686265824378880 Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg Signed-off-by: Michael Niedermayer --- libavcodec/wavarc.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/libavcodec/wavarc.c b/libavcodec/wavarc.c index 896972cec82..827803c91d0 100644 --- a/libavcodec/wavarc.c +++ b/libavcodec/wavarc.c @@ -343,6 +343,8 @@ static int decode_2slp(AVCodecContext *avctx, break; case 0: order = get_urice(gb, 2); + if ((unsigned)order >= FF_ARRAY_ELEMS(s->filter[ch])) + return AVERROR_INVALIDDATA; for (int o = 0; o < order; o++) s->filter[ch][o] = get_srice(gb, 2); for (int n = 0; n < s->nb_samples; n++) {