From patchwork Sat Jan 27 03:13:32 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Niedermayer X-Patchwork-Id: 45851 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a21:8786:b0:199:de12:6fa6 with SMTP id ph6csp354287pzb; Fri, 26 Jan 2024 19:13:45 -0800 (PST) X-Google-Smtp-Source: AGHT+IFnj7uiu9ILsJAGclRXAIr1CoTyajQZVF3scNwvPhMkBSQm7Z0klnZMNTy02oOPxVfmnQ6S X-Received: by 2002:a2e:9a96:0:b0:2cd:a2e:fba6 with SMTP id p22-20020a2e9a96000000b002cd0a2efba6mr460963lji.11.1706325224794; Fri, 26 Jan 2024 19:13:44 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1706325224; cv=none; d=google.com; s=arc-20160816; b=nBH6/pJmoOAkSZjxvktXy5MgFFEuJX9RFhCF/8Ko/b+oVaw024JbYFkQjxt4u4COo5 LV/QzMNWx8r2qXfhNukgTKThWj/Y5dIK3iqiMMASFEtAkt1zpUnXQ+RI9zAYknRYNJYx LPSzIHpp0IcsddsY0+4rr3IHyVIScw2jPAVNQGhuBLXeINKVwgw4XjPDslCbo3bAHg4P fg0QC03OL/yX/KJuaBWwt35IQJoIdhx/8JJ/JoauRgmJsstCWFYR7iVF+DtODW93EOQ/ Zh4QwyyGosJN2/+gV6BQfPvq7S/Wf2KExNkxX7/y5wMXKEPsogNPSrtvkPpnDh1873bT WYZw== 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:cc:reply-to :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:message-id:date:to:from:dkim-signature :delivered-to; bh=AoI1OCF7EVbgfe6zZGMs/URxfdZg8aPpZIb2zbyfmrE=; fh=Xo0fy58WWSQ31lJDBSbqh/pZ7OXs6GHC+hbsx0C3KfM=; b=eOokVEBWMad/iq6zRVWSLOAaoLCdd/H8CfJnLHtSbzASAjYounr4nwinjUpizmJ43S WkWkpjV+pgnExdh/c4q9KeQl//92jKhPt3cntQAvYGtqASFynnKD0I6431OEHpEa+284 t81aq3vAJhqr+Tgl/pajn5cK/0S7xPxfJDesl3R29d4CKHhdt+f0/rMlp5XwVcm0BIny UzscxDErc5dG6EVK1tdGxQMaNLKwQAQJ0+/crCfMqTs8w1fyWwoKWqVyWCdQKSk3Brey g4H0QH/8Y+vXoY5TiZlqQQ4wQt/ZyJkHH7E6f3aQEPCurce3kdAnQ4mC2YwzT5TqLJZ/ LaKA== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@niedermayer.cc header.s=gm1 header.b="CJI0/tKJ"; 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 fk3-20020a056402398300b0055a3694a0bdsi1302528edb.522.2024.01.26.19.13.44; Fri, 26 Jan 2024 19:13:44 -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="CJI0/tKJ"; 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 4D97168D130; Sat, 27 Jan 2024 05:13:40 +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 C79CC68CB6E for ; Sat, 27 Jan 2024 05:13:33 +0200 (EET) Received: by mail.gandi.net (Postfix) with ESMTPSA id 1A809240003; Sat, 27 Jan 2024 03:13:32 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=niedermayer.cc; s=gm1; t=1706325213; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc; bh=AqZhCx2lb7YeqZsQvnFDXT8q39GSq+7eTey94aPjdTQ=; b=CJI0/tKJQE6uV7keYgi21NLboeP46BardC4WVuGXphdvci6/OChJDn8WTEowYWtlDV4EA7 +Y2m0u7AwY6EOsgb4Hf8weAOcGQ3QXQrtbBND38ZlFUWgSvLKY9OfVYRNkKxyiku4xNwJz 9s3iZWoFL8/od38Pxjjc+xuYQLtVoAAsRz2mT96PqLiYBulzPLAQFlVxoGcv22gfPxP5RR 0UfwFDmRFVy6+jvijpq0rGaAYrMP/6Kok4iQWXD9kc6DJrIsPqe2TugcrrEpR9b+JK1LQA lpOvVWknYBhGvVPRL4hOHaVxN3JbTJm96sWcwuvdJq53oRtzzAHszJDJH6mQOQ== From: Michael Niedermayer To: FFmpeg development discussions and patches Date: Sat, 27 Jan 2024 04:13:32 +0100 Message-Id: <20240127031332.17970-1-michael@niedermayer.cc> X-Mailer: git-send-email 2.17.1 X-GND-Sasl: michael@niedermayer.cc Subject: [FFmpeg-devel] [PATCH] avcodec/cbs_h266_syntax_template: check aps_adaptation_parameter_set_id 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 Cc: James Almer MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: celGt9OXWo3+ From: James Almer "When aps_params_type is equal to ALF_APS or SCALING_APS, the value of aps_adaptation_parameter_set_id shall be in the range of 0 to 7, inclusive. When aps_params_type is equal to LMCS_APS, the value of aps_adaptation_parameter_set_id shall be in the range of 0 to 3, inclusive." Fixes: out of array accesses Fixes: 65932/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_VVC_fuzzer-4563412340244480 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 | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/libavcodec/cbs_h266_syntax_template.c b/libavcodec/cbs_h266_syntax_template.c index 9e479c9c314..21da8195556 100644 --- a/libavcodec/cbs_h266_syntax_template.c +++ b/libavcodec/cbs_h266_syntax_template.c @@ -2457,6 +2457,7 @@ static int FUNC(scaling_list_data)(CodedBitstreamContext *ctx, RWContext *rw, static int FUNC(aps)(CodedBitstreamContext *ctx, RWContext *rw, H266RawAPS *current, int prefix) { + int aps_id_max = MAX_UINT_BITS(5); int err; if (prefix) @@ -2469,7 +2470,12 @@ static int FUNC(aps)(CodedBitstreamContext *ctx, RWContext *rw, : VVC_SUFFIX_APS_NUT)); ub(3, aps_params_type); - ub(5, aps_adaptation_parameter_set_id); + if (current->aps_params_type == VVC_ASP_TYPE_ALF || + current->aps_params_type == VVC_ASP_TYPE_SCALING) + aps_id_max = 7; + else if (current->aps_params_type == VVC_ASP_TYPE_LMCS) + aps_id_max = 3; + u(5, aps_adaptation_parameter_set_id, 0, aps_id_max); flag(aps_chroma_present_flag); if (current->aps_params_type == VVC_ASP_TYPE_ALF) CHECK(FUNC(alf_data)(ctx, rw, current));