From patchwork Wed Oct 4 22:59:19 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Niedermayer X-Patchwork-Id: 44156 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:6384:b0:15d:8365:d4b8 with SMTP id m4csp31306pzg; Wed, 4 Oct 2023 15:59:44 -0700 (PDT) X-Google-Smtp-Source: AGHT+IHIX3vDQ3L7yHiOwLsQlV/hxPkHqkrdHKN6ICGishO+ojq/bA2IakU7anHUjJIQr9ybC6BR X-Received: by 2002:a05:6402:14c7:b0:51d:f5bd:5a88 with SMTP id f7-20020a05640214c700b0051df5bd5a88mr3229818edx.38.1696460384647; Wed, 04 Oct 2023 15:59:44 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1696460384; cv=none; d=google.com; s=arc-20160816; b=x5JrznYVbpWH26yum6Nh0N00ZNraH+Frkh6iexk0fiyFPfzXV3IDPVhchoI2Y1SAoz +kY/6TJcWyXzQ2I+frP1YxJoi9z2n1YtYZxe09R2ULp3keZ6pfVmn+3oRPMAzwZLMlF0 LSUMWHIRq4uo/PHTv1GTtHaYLDMVUH2wF76gngwuGiqOiSdZZ8epoB0mw5kgXjhy+2QA zsd53rK9vhbVZ0/eCjSeKdskKKlvCrLDdSxMdPJsPkHoBE+hWnFbOmdU0zkqRAgaGwHp EukcYOhr0+LIXJ47wAmbu/e917tO4tK5KoOhdZ1tyR7V1+h8SM6a7bAhATwXRQ7zhNz5 4veQ== 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=4MVfIKtgCTcW2pDjywnpdtfxNhlrEsV5rNdQ67mE5mc=; fh=e5zN9xSzcxLA6bGo3lF+CqTbY/oLwzApV03EO/RBfgQ=; b=RwRB0vraWcM8CQ1Hrt6xjzqZLplE1HwNPTA7bGoySaK/uwmtreef4ibZ/9B0wzNqed 0LXOad77cy8oFAKo4IBs0afiZh2Fnb9WpDgI1s8zuAH2+z9cilrWUnrOURACpaPTuseq MTgTTEFGEcHMXvcMIpL78NwIFJDMdzikI7RcOBib9JbEpZYq/VH7f6xqJXmUxXfvGeCp 3dp335yYTS0mU7cUflH/+C77mwU9FLI7NaiCmgTxPKNXdR0tdvkXtW57eNHihDRZScid lMMmZG4PTn/UYzaBK3YOy9IY6UIUVT4hOsszW9QS6t7s/a8GN/dp/ZHhWjM1P63LPEFw XZzw== 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 m10-20020aa7d34a000000b005364bc0e5c3si106757edr.124.2023.10.04.15.59.44; Wed, 04 Oct 2023 15:59:44 -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; 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 2DD4168CAD4; Thu, 5 Oct 2023 01:59:31 +0300 (EEST) 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 3279068B752 for ; Thu, 5 Oct 2023 01:59:24 +0300 (EEST) Received: by mail.gandi.net (Postfix) with ESMTPSA id 22E5BE0006 for ; Wed, 4 Oct 2023 22:59:22 +0000 (UTC) From: Michael Niedermayer To: FFmpeg development discussions and patches Date: Thu, 5 Oct 2023 00:59:19 +0200 Message-Id: <20231004225921.30287-2-michael@niedermayer.cc> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20231004225921.30287-1-michael@niedermayer.cc> References: <20231004225921.30287-1-michael@niedermayer.cc> X-GND-Sasl: michael@niedermayer.cc Subject: [FFmpeg-devel] [PATCH 2/4] avcodec/evc_parse: Check num_remaining_tiles_in_slice_minus1 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: 9k9wiZt1KyMo Fixes: out of array access Fixes: 62467/clusterfuzz-testcase-minimized-ffmpeg_BSF_EVC_FRAME_MERGE_fuzzer-6092990982258688 Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg Signed-off-by: Michael Niedermayer --- libavcodec/evc_parse.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/libavcodec/evc_parse.c b/libavcodec/evc_parse.c index bd3a4416f2d..5ab33166cf3 100644 --- a/libavcodec/evc_parse.c +++ b/libavcodec/evc_parse.c @@ -58,8 +58,12 @@ int ff_evc_parse_slice_header(GetBitContext *gb, EVCParserSliceHeader *sh, if (!sh->arbitrary_slice_flag) sh->last_tile_id = get_bits(gb, pps->tile_id_len_minus1 + 1); else { - sh->num_remaining_tiles_in_slice_minus1 = get_ue_golomb_long(gb); - num_tiles_in_slice = sh->num_remaining_tiles_in_slice_minus1 + 2; + unsigned num_remaining_tiles_in_slice_minus1 = get_ue_golomb_long(gb); + if (num_remaining_tiles_in_slice_minus1 > EVC_MAX_TILE_ROWS * EVC_MAX_TILE_COLUMNS - 2) + return AVERROR_INVALIDDATA; + + num_tiles_in_slice = num_remaining_tiles_in_slice_minus1 + 2; + sh->num_remaining_tiles_in_slice_minus1 = num_remaining_tiles_in_slice_minus1; for (int i = 0; i < num_tiles_in_slice - 1; ++i) sh->delta_tile_id_minus1[i] = get_ue_golomb_long(gb); }