From patchwork Fri Jan 26 21:46:50 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Niedermayer X-Patchwork-Id: 45849 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a21:8786:b0:199:de12:6fa6 with SMTP id ph6csp237500pzb; Fri, 26 Jan 2024 13:47:18 -0800 (PST) X-Google-Smtp-Source: AGHT+IHCkosLOyCPGyFrFXqieEE0ShlKm9Z46f/rjXExPoxfNtXAn/s5drYfBfA0oRqq6BXyKF0r X-Received: by 2002:a2e:9b52:0:b0:2cf:4994:616b with SMTP id o18-20020a2e9b52000000b002cf4994616bmr317877ljj.15.1706305637768; Fri, 26 Jan 2024 13:47:17 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1706305637; cv=none; d=google.com; s=arc-20160816; b=K/Vpar9HdEQogJDrid3XXlp5jeCbs/OTvpEgovMCr2S8Z7qjDKhLrpWv590cVEJZE4 WpgDWlL2r/8sGmU5clnAKET61IgrPnTX5TFl9BMD2tWnoqsZNWpi+2nWfy+FAA+nPpLG vbRZTHarbd/uJpCap9HPvw2v4AADuBJ5hwdrU4kixmLLtUhtTQHYUe91Tnm6/9pS06za P6cpgfFNA3KTlxEcDc1rVq8y90bg8jkF9VSKknQPGHcb9VjP01HjiK/mTm90y5teiPre VBDd9wCLSdppHoy02wDwjQMQjNED1NtE8LdNCaLEzJwLxgNYZ7i+yzthpk0mf7RvPF8R Xbmg== 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=WtnIH9Orvq7LJ13ebmwSQ8o7qfzXtJS6QRVS+0/BHWQ=; fh=e5zN9xSzcxLA6bGo3lF+CqTbY/oLwzApV03EO/RBfgQ=; b=sTNzWGyNEyb/+3ATkKYiJmp8E43XKtNuBBE0cgeNWDn4wLafmrjzYRYlaq/axrZBbS nPPOOoypUzvkCHbVfEyvCr738pLJluvP2aMburz22rIrJtW7LvSMUGovl0q+8wiBUMXK rnJ7S5g0m3pGAqQA/xHf/RYph22vcTWAt+brgoLlYNUYoovfvRoMQbt/VBiaX0ousTs3 OXWCL5mrk9uYzWQtD6WcPM05F8Ek6Unlkf478qnc5HomOb2eu1ONxr7Wf17/Zhp/chOQ AJqfEkzTNH4AiCO5Lg2DCmE9NgScUVtKYLq98nKWu3oJv+kMs49ds2RYKLCOSfcqE6KA emyg== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@niedermayer.cc header.s=gm1 header.b=Uj9Fyr10; 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 q2-20020a056402248200b0055d36e96166si850537eda.444.2024.01.26.13.47.17; Fri, 26 Jan 2024 13:47:17 -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=Uj9Fyr10; 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 0BDB368CFDD; Fri, 26 Jan 2024 23:47:02 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from relay6-d.mail.gandi.net (relay6-d.mail.gandi.net [217.70.183.198]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 1D27E68C4F1 for ; Fri, 26 Jan 2024 23:46:54 +0200 (EET) Received: by mail.gandi.net (Postfix) with ESMTPSA id 71A21C0002 for ; Fri, 26 Jan 2024 21:46:53 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=niedermayer.cc; s=gm1; t=1706305613; 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=VVDuji76/Jy8t2oRY4XD4wzZsXfl7QXaXtvquFUqWZo=; b=Uj9Fyr10qLsruG3DLBmLI6ZT5OOaUBORBymME89h4SkUTBE9LQXulyy2Fyz6vYWe5gsn3i 0whQ5EtgpnJ55CLCc+JJ2S47+E3HBJPUROiR7gLg889gEZXnod3CkD/MLnIH6fCgu3sukH m89jAv9xbXkdCi2WqHmXP5kFyu0SqC9951WgdhFNK3XXMzF3Z1oN8Kc440O5Z6HWqYx2GN pmwZs96yln0aPRq8zc8O5sKRrJDVyWqZF8FffBrxJ1iMwiFAR0go3IxQldaI+OvMlWoAfr YTHCMdJCxYB2nAAj/wA+ava40nTEXqT2qsC6tOCaq2REhhIBx7g5Hwf5v7NQJw== From: Michael Niedermayer To: FFmpeg development discussions and patches Date: Fri, 26 Jan 2024 22:46:50 +0100 Message-Id: <20240126214651.22783-2-michael@niedermayer.cc> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20240126214651.22783-1-michael@niedermayer.cc> References: <20240126214651.22783-1-michael@niedermayer.cc> X-GND-Sasl: michael@niedermayer.cc Subject: [FFmpeg-devel] [PATCH 2/3] avcodec/cbs_h266_syntax_template: sanity check num_multi_layer_olss 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: batG9joj29sw It is not possible to encode a index into an empty list. Thus this must be invalid at this point or before. Its likely a broader earlier check can be used here, someone knowing VVC should look at that. Its not immedeatly obvious from the spec by looking for numlayerolss Fixes: out of array access Fixes: 65160/clusterfuzz-testcase-minimized-ffmpeg_BSF_VVC_METADATA_fuzzer-4665241535119360 Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg Signed-off-by: Michael Niedermayer --- libavcodec/cbs_h266_syntax_template.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/libavcodec/cbs_h266_syntax_template.c b/libavcodec/cbs_h266_syntax_template.c index 549d0212119..9e479c9c314 100644 --- a/libavcodec/cbs_h266_syntax_template.c +++ b/libavcodec/cbs_h266_syntax_template.c @@ -946,6 +946,8 @@ static int FUNC(vps) (CodedBitstreamContext *ctx, RWContext *rw, if (!current->vps_each_layer_is_an_ols_flag) { uint16_t vps_num_dpb_params; + if (!num_multi_layer_olss) + return AVERROR_INVALIDDATA; ue(vps_num_dpb_params_minus1, 0, num_multi_layer_olss - 1); if (current->vps_each_layer_is_an_ols_flag) vps_num_dpb_params = 0;