From patchwork Tue Feb 27 22:47:08 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Niedermayer X-Patchwork-Id: 46612 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:aea4:b0:19e:cdac:8cce with SMTP id do36csp25316pzb; Tue, 27 Feb 2024 14:47:29 -0800 (PST) X-Forwarded-Encrypted: i=2; AJvYcCUs4y1JyYWOn/qsBWaK/oBiMN0A9i7I6A8rCi0W+QsG2Oqk8x4CUMKbxF3M3V0bmFtI4C5RT66ff98WC2o3osaJ+dD4W/AQxNDV5w== X-Google-Smtp-Source: AGHT+IGvu77pdUGNterhUHkGa1nc/bBSrFT2AFNt6tC9mv6SK7BFw5PSzIOs5qDx84SOFyO5q8i/ X-Received: by 2002:a05:6512:2096:b0:513:13e7:8b28 with SMTP id t22-20020a056512209600b0051313e78b28mr1339550lfr.16.1709074049066; Tue, 27 Feb 2024 14:47:29 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1709074049; cv=none; d=google.com; s=arc-20160816; b=jOPLgeJTD6da8d7vOPlqOsobg2VXHjoqTL29rLTJWxsD2FdCQlgcMLRuDk+rKiRinQ P8d50yqLYfUEOGNM5/2DAM80+YGHdMY1Km1gPv+rKexjltDVE81HSYqGV7VR+E6jENAD UYS8v6PKPU0e93f0HKIyKNWrP1Yg+6mIDYZd90zzC2JKSWTkjfT1wbh6E7BB4MZLc2hH l5SPgQf97+yjc/Zjjw9914k0ZqGprsQioCtbVCa7BSXKx6+REmHOBip3rNTe0nBBQO1f sqROMaTpH++/rI9KO4YejLwWv5HJyuOwVfjgvoS2Rt9Ii+uQPn5zyLOU0RwlJXho1hgR bysw== 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:dkim-signature:delivered-to; bh=VPrOI4QKKvz3Gm4FYZl24XoT+nJTJ/gR4tlH5pI09Uk=; fh=e5zN9xSzcxLA6bGo3lF+CqTbY/oLwzApV03EO/RBfgQ=; b=m1fS6mcUc+vFZYGF46Osf8o/RtQgn5VVinGs+Bj4o4Wa+UZCNtUWkURVimy9izpRX9 v1VT3q0Ayt39AkJTZWBNOInpYsy+bkXc2qfQrwR/071nEVpVdb3JOwPclJCAVK8cTDCe QYarQgkUXvxu3FEWi+sgkSPNx023rzHY03u6a+w2YfMmDPSFskV0QMCAnbOQyM4wtffR Ke2/X1Yme0MEGSrRzKLvAJfO1CJOcnokLrXJie/ahjVAMb4zwEfHb67U2ggZY87+RH7F c8PzQMlFpAWQley6zFwwQ5wltvDgPcYkv8qqQgmuSa0qVk+IQuz1Pu/ISe1bf4Pqd8Zd vKCg==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@niedermayer.cc header.s=gm1 header.b="D8HhYY/N"; 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 z10-20020a170906714a00b00a43838c02bdsi1105115ejj.207.2024.02.27.14.47.28; Tue, 27 Feb 2024 14:47:29 -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; dkim=neutral (body hash did not verify) header.i=@niedermayer.cc header.s=gm1 header.b="D8HhYY/N"; 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 E3A0E68C867; Wed, 28 Feb 2024 00:47:19 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from relay1-d.mail.gandi.net (relay1-d.mail.gandi.net [217.70.183.193]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 1ECB168B02D for ; Wed, 28 Feb 2024 00:47:11 +0200 (EET) Received: by mail.gandi.net (Postfix) with ESMTPSA id 0FAB5240006 for ; Tue, 27 Feb 2024 22:47:09 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=niedermayer.cc; s=gm1; t=1709074030; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:in-reply-to:in-reply-to:references:references; bh=EwhzC06EiUg/2vOPx2ieftxJpijU3/KmhazPpb8WUgw=; b=D8HhYY/NJQR/ZJ/MrY5poq5o2QCvdMSZwxT29wqgTLe0ANEGwPSqat4qpMz48Q5S4pVodA gt5fpbC/ekxCvUAaabNpFLvhO4LQi1SwEXNV7qbKDtziOsZb2oDAGPn+NxOtA1OVPfPqnt FPHDZqsl8n+wXNYbv/NBBU3IENo17sAgsxtIoPoTf1XWC5g9nOY6NuIP9Or+dG5jkwcSOA +pzwoPj6BhuzcPAquGBDxCjFa/69sBsv61VNcE4nYq02wBdAHDw5Nec3ImFOCHKhAzHrpI Rt/6+vWSHZ+RMNfT9vfzlIUM2OFahmpjpYiC8bfmCOv+eNy0KQbvUlS0pdn6Mw== From: Michael Niedermayer To: FFmpeg development discussions and patches Date: Tue, 27 Feb 2024 23:47:08 +0100 Message-Id: <20240227224708.6883-2-michael@niedermayer.cc> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20240227224708.6883-1-michael@niedermayer.cc> References: <20240227224708.6883-1-michael@niedermayer.cc> X-GND-Sasl: michael@niedermayer.cc Subject: [FFmpeg-devel] [PATCH 2/2] avcodec/vorbisdec: Check remaining data in vorbis_residue_decode_internal() 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: JuqQ06jLQ4IE Fixes: timeout Fixes: 66326/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_VORBIS_fuzzer-6295291863040000 Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg Signed-off-by: Michael Niedermayer --- libavcodec/vorbisdec.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/libavcodec/vorbisdec.c b/libavcodec/vorbisdec.c index faeaeadde7..bf26b13b83 100644 --- a/libavcodec/vorbisdec.c +++ b/libavcodec/vorbisdec.c @@ -1468,6 +1468,9 @@ static av_always_inline int vorbis_residue_decode_internal(vorbis_context *vc, unsigned step = FASTDIV(vr->partition_size << 1, dim << 1); vorbis_codebook codebook = vc->codebooks[vqbook]; + if (get_bits_left(gb) <= 0) + return AVERROR_INVALIDDATA; + if (vr_type == 0) { voffs = voffset+j*vlen;