From patchwork Wed Jan 11 23:54:27 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Niedermayer X-Patchwork-Id: 39979 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:bc95:b0:ad:ade2:bfd2 with SMTP id fx21csp5132458pzb; Wed, 11 Jan 2023 15:54:47 -0800 (PST) X-Google-Smtp-Source: AMrXdXv1S391xee8vF7clTaR+rlZ8SV0fLR/yxe7IDoPd/X8OLkbAVtJS4FW56+ksXgPbDCgdkLL X-Received: by 2002:a17:907:3e26:b0:7ad:c8d7:4fd9 with SMTP id hp38-20020a1709073e2600b007adc8d74fd9mr83897413ejc.36.1673481287732; Wed, 11 Jan 2023 15:54:47 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1673481287; cv=none; d=google.com; s=arc-20160816; b=yh4eQa4WOlUS1xzVi421z3+Gck+puMOcR2/B93+DudE8138tjNPE3M2epHMuE+PLk2 vsrciDDx+pm/lxgsp8sfaFIjKCjKOM8J4Iks7SWV7yxvnEghlngx+hY5Px/ZCokumT9V iTTSUCnZ/No+LrJDK/+iednDC2JGMiXV9NnTfVEn/JdXpuaszbcKxDXRfQYKjFjHAGft hYeW5u5OLGdVUrcbJt7bTnWibwmuOqyE4rDNl0SNpoYSp13YG2TwFPAM2JQm6kfUxYFW eqmf1g2Qg3EOmYwIkbLkUeXSqwx8R/8bTJrKAf8iQyZ7cTL2Qmo8qC3Z+IfsRjBLNK3T YGlQ== 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=vh5OtanMsey8HHO/sjX3Q4XCSOvnFI8sRSoKgkGHFY0=; b=NbopHGN0gyXRrVBuMTE1cVrdxJOh/ye/gAXxYCadYhwteyuSMYOiyGGHkjIx5fJOtD mcUEqQEngo7Tyjt0YJlNxPae6SCNUv3XUUmrA8LU45DVidEhILb9o5HuQW8+p3AtfP5Q CLSEoVowRGxIs/o88U6Jmb5yhsg4vD+jbUcfT1vTSm8A2OCU0jPi5zzd7Rm9WIhlndPj 1OYsIiPbtEzYeabsVVgQHAXCpFwPsTkyM68yzo3JaoldOD2BfVv/G5/mKaUl6LqhvTtA GLlzBlAo3AA06rwZ8EzrPg6OjXyaoWlHSZehHY367evFxxTpyiT4EPLmH3J75DBZpYKp gZsQ== 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 hw20-20020a170907a0d400b0084cbf5552b3si12350315ejc.970.2023.01.11.15.54.44; Wed, 11 Jan 2023 15:54:47 -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 CA31068BCFC; Thu, 12 Jan 2023 01:54:40 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from relay10.mail.gandi.net (relay10.mail.gandi.net [217.70.178.230]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 4D8E468A4CA for ; Thu, 12 Jan 2023 01:54:34 +0200 (EET) Received: (Authenticated sender: michael@niedermayer.cc) by mail.gandi.net (Postfix) with ESMTPSA id 92FFF240004 for ; Wed, 11 Jan 2023 23:54:33 +0000 (UTC) From: Michael Niedermayer To: FFmpeg development discussions and patches Date: Thu, 12 Jan 2023 00:54:27 +0100 Message-Id: <20230111235432.2135-1-michael@niedermayer.cc> X-Mailer: git-send-email 2.17.1 Subject: [FFmpeg-devel] [PATCH 1/6] avcodec/eatgq: : Check index increments in tgq_decode_block() 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: rJTHlixEJjRC Fixes: out of array access Fixes: 48567/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_EATGQ_fuzzer-6743211456724992 Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg Signed-off-by: Michael Niedermayer --- libavcodec/eatgq.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/libavcodec/eatgq.c b/libavcodec/eatgq.c index 89e9f20880..beb9f4d046 100644 --- a/libavcodec/eatgq.c +++ b/libavcodec/eatgq.c @@ -56,7 +56,7 @@ static av_cold int tgq_decode_init(AVCodecContext *avctx) return 0; } -static void tgq_decode_block(TgqContext *s, int16_t block[64], GetBitContext *gb) +static int tgq_decode_block(TgqContext *s, int16_t block[64], GetBitContext *gb) { const uint8_t *scantable = ff_zigzag_direct; int i, j, value; @@ -64,6 +64,8 @@ static void tgq_decode_block(TgqContext *s, int16_t block[64], GetBitContext *gb for (i = 1; i < 64;) { switch (show_bits(gb, 3)) { case 4: + if (i >= 63) + return AVERROR_INVALIDDATA; block[scantable[i++]] = 0; case 0: block[scantable[i++]] = 0; @@ -73,6 +75,8 @@ static void tgq_decode_block(TgqContext *s, int16_t block[64], GetBitContext *gb case 1: skip_bits(gb, 2); value = get_bits(gb, 6); + if (value > 64 - i) + return AVERROR_INVALIDDATA; for (j = 0; j < value; j++) block[scantable[i++]] = 0; break; @@ -100,6 +104,7 @@ static void tgq_decode_block(TgqContext *s, int16_t block[64], GetBitContext *gb } } block[0] += 128 << 4; + return 0; } static void tgq_idct_put_mb(TgqContext *s, int16_t (*block)[64], AVFrame *frame,