From patchwork Thu Mar 21 01:15:16 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Niedermayer X-Patchwork-Id: 47276 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a21:3a4a:b0:1a3:31a3:7958 with SMTP id zu10csp262463pzb; Wed, 20 Mar 2024 18:15:52 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCXbyET2oOEBGByZJu2XEfIYvmmM7OMrzUQqGBLwXc5lUXYXW0cYiQrWBa/KXjZiB3eCK8m9L7MAOdhJ861W3LKp0icV7Vv2otEqhQ== X-Google-Smtp-Source: AGHT+IGrgu0s27IRDtF3j0ggjXfa+vZmRRcg+z38eCL82voLB6r0n5fmhuvWB14utywpzCgLB0aW X-Received: by 2002:a19:5e1a:0:b0:513:c25a:eec3 with SMTP id s26-20020a195e1a000000b00513c25aeec3mr4977055lfb.4.1710983752703; Wed, 20 Mar 2024 18:15:52 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1710983752; cv=none; d=google.com; s=arc-20160816; b=WlfWkGvRSNfUhgwF3Nk/uA47XwVnpBBcqK94oBRrqyfHtxvBE6A4GYyxBd8YeZPHDO uqr+nS13eqLpEBo1a5/j4apUtbjrkYhA36siI3LNhPFFPJu2O5gc/ZkVW+Er3ch9w7uZ MngjngqNJbGZSSuSTG3cBTG7v6qnnaeUa7NE3oEF/5MPm5cRm2uLGLPd3rIn9O9VBR6e zbYYbG3nxrpHq3jpKtdotnsJpPSTmibAc0h4Du+LEIZcD5rycq8KmAXssZmSFDkiI+bm Yil0yy2mX79qusHILHEeAiCyjOI9Ni4q8PSMgQ0MMRPCR5boenSotf3D+Xh7wF4nLpev bgbw== 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=ygfgqhejEnMonM3kRaYs0oY1cuFLkd2ccD4IrpZ7rQA=; fh=e5zN9xSzcxLA6bGo3lF+CqTbY/oLwzApV03EO/RBfgQ=; b=OhshydQhqHaIvRXeKRgKNgGm2dyQTIGim5bYbsEHb9b3A+r7tkI0qG3OrFqaupr5KS JmYRAJ+cHKh/mq/ThBHTrOFi8kGzS2gijLOnBtrFvIzP5aT/9q+yO+20JGBdwxHAw5WU u074zU8UygU/3nD7Tgl5C3/5cBV7mj/I7zEAPvX6tNpEItIaxh3/VfxSaFnT4zN0c+je CoXW48s/sr/KIpvCYna+caFvDveclhPCWBArwUw/DpOFSTZKCxZi+RJEjHqwMpGZnFLd 5EpqCzvX17HaJTtcCLimugK4Off47Wr8a5vuS9MG+T+3kdmOEB3K6X+Q5plT7d2MGcv3 NzDQ==; 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=KHvWSKB9; 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 v9-20020a170906564900b00a465f304271si6891102ejr.483.2024.03.20.18.15.52; Wed, 20 Mar 2024 18:15:52 -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; dkim=neutral (body hash did not verify) header.i=@niedermayer.cc header.s=gm1 header.b=KHvWSKB9; 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 1DA1D68D4F6; Thu, 21 Mar 2024 03:15:30 +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 EEBAE68D305 for ; Thu, 21 Mar 2024 03:15:21 +0200 (EET) Received: by mail.gandi.net (Postfix) with ESMTPSA id 4CA23E0004 for ; Thu, 21 Mar 2024 01:15:21 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=niedermayer.cc; s=gm1; t=1710983721; 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=xRXxEeO9EKTik90mm3HokHMb3AiGIV68TfVJcqmFgz4=; b=KHvWSKB9RmsOhX03jV1o5rtubAsYMN53gf3XGQJICdajZXN9+dFhHtT0rW7P8gcfz/MXOm pqUPu05Fqe08D/Yuxy5yUElcIjm7p60hR6Ub9b3KiWkpiGj2pxQyN5fJ4BQEm1X2vfda9r VU5FBB1awAwrDwVrmeNn5h2r4eSVdg+k27wAgwM0ebNRPwOSsvgNgr7c69DimDfEbxFqTJ pFH3XQH/rV+8M4psYg4s8c2ZSkWmaXG9pk2xwOuYs3WXb+3BfteWA1w4Jtf84HAhggJyyS KyQLb4xLGMmOHQoCQTGcML0QWN1ROuYjYkHArn8kx9+SG9OtG1xGGLutfgH9jQ== From: Michael Niedermayer To: FFmpeg development discussions and patches Date: Thu, 21 Mar 2024 02:15:16 +0100 Message-Id: <20240321011517.10363-3-michael@niedermayer.cc> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20240321011517.10363-1-michael@niedermayer.cc> References: <20240321011517.10363-1-michael@niedermayer.cc> X-GND-Sasl: michael@niedermayer.cc Subject: [FFmpeg-devel] [PATCH 3/4] avcodec/cbs_h266_syntax_template: Check tile_y 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: A7WSuSPKEaGN Fixes: out of array access Fixes: 67021/clusterfuzz-testcase-minimized-ffmpeg_DEMUXER_fuzzer-4883576579489792 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 49fb12ba77..0aae9fdfd5 100644 --- a/libavcodec/cbs_h266_syntax_template.c +++ b/libavcodec/cbs_h266_syntax_template.c @@ -2072,6 +2072,8 @@ static int FUNC(pps) (CodedBitstreamContext *ctx, RWContext *rw, tile_x = tile_idx % current->num_tile_columns; tile_y = tile_idx / current->num_tile_columns; + if (tile_y >= current->num_tile_rows) + return AVERROR_INVALIDDATA; ctu_x = 0, ctu_y = 0; for (j = 0; j < tile_x; j++) {