From patchwork Sat Feb 18 23:18:50 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Niedermayer X-Patchwork-Id: 40447 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:5494:b0:bf:7b3a:fd32 with SMTP id i20csp862939pzk; Sat, 18 Feb 2023 15:19:22 -0800 (PST) X-Google-Smtp-Source: AK7set+qmrmmBbSeowAR0KgPAb+izj9jQ0zmwz/7EOv8x/gnIZY3xy9XdHxt8JTZNW1xxXPjxkI9 X-Received: by 2002:a17:906:248c:b0:878:5f35:b8d6 with SMTP id e12-20020a170906248c00b008785f35b8d6mr5741044ejb.51.1676762362190; Sat, 18 Feb 2023 15:19:22 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1676762362; cv=none; d=google.com; s=arc-20160816; b=LzpKqcW86aUKUUAOSEttQ/Y56jE4bJittQFnAxrNg+5FMyNZiJxgdc8igZtQBnv8qM IUtW/JMwutJNjDgK7hZwILRXVE9P8CuG5bvAQWt99J/I8sCzTXoR9jg2nawNcZSfv3Ud Ew/Tc+6H+JjaOr2BGIz27ns+BNMctZmc6XjqS20KmB4MlJxcbKG4ARo48bSatruk7K4J D8vUzncpUAHcLBSsrxadFAAyOjNb1aSijG3XxO64lTYqSPMegSog8Blm1WlUXZaJLbHf w6soVFSiGuK/0zG7sXpYH0CiBNhhMBB6q7vhhAY6nHkIzA5N2YLawXN7OMgYXWKVALFW W00w== 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=xA34dqcHkLoZTwkGyKl/B5CxkFnu7tNeuvCiQM+qO3g=; b=mtoqSLLbnO9hhRqnzS43yXrd6cWlKAv78mRkOh3+ViSAHxaJl/zJHtA5UHqKFK8OIj hrME4G8ziKffa+Cuetpvs6+CiS+v3Q6NYEpUaguXnuxdlnP1b1m9vp9gmpNmcd5cI17h gJuseaZGqCYdwLynHdEw5+olhLISzcZIKrYbbzfDl9xAG4Xt7QrJGnVuo5zgksYsobR8 FSrm52dYkYG9/Udg0pdruzR5dCNmzOKcLelYBXUK23UvsYbB2AcGp2Z9kd2UoDf2YvIU rBGT8Wlyc1qJ/iPVqLnhjJVbkoxIYMuqu41PV8xnb8s5pMERVpAhfno7/y4ynuVe52hv z8yQ== 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 uh39-20020a170906b3a700b00887cdc2699fsi8844280ejc.544.2023.02.18.15.19.21; Sat, 18 Feb 2023 15:19:22 -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 8C51668BF18; Sun, 19 Feb 2023 01:19:02 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from relay4-d.mail.gandi.net (relay4-d.mail.gandi.net [217.70.183.196]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id BCF9C68BE7C for ; Sun, 19 Feb 2023 01:18:54 +0200 (EET) Received: (Authenticated sender: michael@niedermayer.cc) by mail.gandi.net (Postfix) with ESMTPSA id 0D258E0004 for ; Sat, 18 Feb 2023 23:18:53 +0000 (UTC) From: Michael Niedermayer To: FFmpeg development discussions and patches Date: Sun, 19 Feb 2023 00:18:50 +0100 Message-Id: <20230218231850.20522-3-michael@niedermayer.cc> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20230218231850.20522-1-michael@niedermayer.cc> References: <20230218231850.20522-1-michael@niedermayer.cc> Subject: [FFmpeg-devel] [PATCH 3/3] avcodec/wavarc: Check k 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: o+dRqT6nRXGO Fixes: Assertion failure Fixes: 55849/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_WAVARC_fuzzer-6590105973555200 Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg Signed-off-by: Michael Niedermayer --- libavcodec/wavarc.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/libavcodec/wavarc.c b/libavcodec/wavarc.c index b626daa66e..8d37af9571 100644 --- a/libavcodec/wavarc.c +++ b/libavcodec/wavarc.c @@ -192,6 +192,8 @@ static int decode_1dif(AVCodecContext *avctx, if (block_type < 4 && block_type >= 0) { k = 1 + (avctx->sample_fmt == AV_SAMPLE_FMT_S16P); k = get_urice(gb, k) + 1; + if (k > 32) + return AVERROR_INVALIDDATA; } switch (block_type) { @@ -282,6 +284,8 @@ static int decode_2slp(AVCodecContext *avctx, if (block_type < 5 && block_type >= 0) { k = 1 + (avctx->sample_fmt == AV_SAMPLE_FMT_S16P); k = get_urice(gb, k) + 1; + if (k > 32) + return AVERROR_INVALIDDATA; } switch (block_type) {