From patchwork Thu Sep 21 18:09:10 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Niedermayer X-Patchwork-Id: 43869 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:38a7:b0:15d:8365:d4b8 with SMTP id n39csp310290pzf; Thu, 21 Sep 2023 11:09:55 -0700 (PDT) X-Google-Smtp-Source: AGHT+IFQRMLuKvsl/IRo4cAeAcb1xDfxk6DkQjXApunBxjcOwn0B0b5rTzeKk94Rz2swRqKjaAiw X-Received: by 2002:a17:906:8a65:b0:9ae:3e72:7c6f with SMTP id hy5-20020a1709068a6500b009ae3e727c6fmr4956229ejc.69.1695319794705; Thu, 21 Sep 2023 11:09:54 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1695319794; cv=none; d=google.com; s=arc-20160816; b=FADgpCgoD86onNbtKc0jBLJZ3+SGe5q76bDZSXuVMCxtoaELnX5w5eFhh092Fwz6DO vbcNkqGIA7tnHMBJl1LqFgKiMcgclwpxeqfAHUuLcqastfXHyYnIazDZflLq8HoGDKVt v+JJzls7dqslyQPv/7mnXBRwZcji8WBDEjRJQMT/bghGbSYWPOqnxlFA6T3MgWC4VjOb opSNT6DDBcHewrOVH8EkM56Hp0NDRWtWNvyUIvYVNLYAdkZLTLHFmSSz4KvXM3yiyLsi ihGNpETE/ZH+VzMe0RRknb3dzfvCpSPkyLkJtYPRJVDH4jTyNzz3EMt8n6TEwc5O3gPe O6BQ== 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=DAiU+T5nJ6dueNRSriw3RfW4rKneSe6Rgh0C82eVmvA=; fh=e5zN9xSzcxLA6bGo3lF+CqTbY/oLwzApV03EO/RBfgQ=; b=Kml2KZppKddY4DGVD03ypYvkb8Lqt10ln1bUw6ilQyz2DjPUgTBtQYuiU1YiO8KADx ZgCAKMxtEqKmSBXtk2K9pssgPyiSJK7XQXK1gnLNRJBqT3woBSbHeYhXb1OFzBz3N+dd jcpD7Ho3THPsg1x7q4Ke4jnrHCKYxV85EkH3YrGgQiXlyTsBXZW6p8kjz2NtN9radSR2 5IyQyXI0HcYUWkj1ujhXJfd7pjPwM7MfTUPwwytojQecdjm47gp2wusD/tOFdL7gG4mq V+FYo2Ws4jFqRdXYaRZXMI2/41NhHmjk1+Mflbl4Jd5pTi01P4owLi4xbIBi+meQmRFJ +QRg== 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 t23-20020a17090605d700b00994b9b22346si1657753ejt.887.2023.09.21.11.09.54; Thu, 21 Sep 2023 11:09:54 -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 8E4B268C948; Thu, 21 Sep 2023 21:09:25 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from relay2-d.mail.gandi.net (relay2-d.mail.gandi.net [217.70.183.194]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 03C2268C83D for ; Thu, 21 Sep 2023 21:09:16 +0300 (EEST) Received: by mail.gandi.net (Postfix) with ESMTPSA id 6362740006 for ; Thu, 21 Sep 2023 18:09:16 +0000 (UTC) From: Michael Niedermayer To: FFmpeg development discussions and patches Date: Thu, 21 Sep 2023 20:09:10 +0200 Message-Id: <20230921180912.10733-4-michael@niedermayer.cc> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20230921180912.10733-1-michael@niedermayer.cc> References: <20230921180912.10733-1-michael@niedermayer.cc> X-GND-Sasl: michael@niedermayer.cc Subject: [FFmpeg-devel] [PATCH 4/6] avcodec/wavarc: Check k in decode_5elp() 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: p2zoJXm8zVXq regression since 18b2ecc24778140c2bc798ed64842dc8feb6dc3a Fixes: assertion failure Fixes: 62164/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_WAVARC_fuzzer-6280165808013312 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 9ba95143b8a..a9d98f0c55e 100644 --- a/libavcodec/wavarc.c +++ b/libavcodec/wavarc.c @@ -539,6 +539,8 @@ static int decode_5elp(AVCodecContext *avctx, if (block_type >= 0 && block_type <= 7) { k = 1 + (avctx->sample_fmt == AV_SAMPLE_FMT_S16P); k = get_urice(gb, k) + 1; + if (k >= 32) + return AVERROR_INVALIDDATA; } if (block_type <= 2 || block_type == 6 || block_type == 13 ||