From patchwork Wed Oct 4 22:59:21 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Niedermayer X-Patchwork-Id: 44158 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:6384:b0:15d:8365:d4b8 with SMTP id m4csp31451pzg; Wed, 4 Oct 2023 16:00:04 -0700 (PDT) X-Google-Smtp-Source: AGHT+IGABDn2eSIDfimduTynILE2dU06gaBh1G570MWAWGVjMC7PRSyusRlzdVkLO/guooJVScKI X-Received: by 2002:a5d:654e:0:b0:31d:db92:31ae with SMTP id z14-20020a5d654e000000b0031ddb9231aemr3424348wrv.44.1696460404220; Wed, 04 Oct 2023 16:00:04 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1696460404; cv=none; d=google.com; s=arc-20160816; b=cdr53iEG7StduBnrAk/ouUSN8J0FiqMFOMLoTvVFeEcvQEAVvz2n1AxSVqzB0e5LA/ 4HmMjI/Tn6TSmOowgLlj6/BorC13C8hABy86yNuRLGitdrFT5auxZzcM2QfIkKz3sbBJ WTqR4sQDK4ORZQHS3SIQvRQCnzmeq6EDBnHNQNjU7J61DbUoxK/8w1kcNu7bXee0p5bM 2YGKG0VIzYwUjhSMqOKa+mFJ8IsVSY0s2bplrV1zxXbsHl9wvBGmuNPBQ2E/uLv+l0av kBn+Y96Bl2z/g7GGV905kW3G1sdeHxxYdd6F+UQ14y1juT8cAABwA1PrBSUPN5CnDI3J +vqg== 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=Fkabplv1w/Q8SkvTTQw1StBZVLlO+avtRgDUpa9m0FQ=; fh=e5zN9xSzcxLA6bGo3lF+CqTbY/oLwzApV03EO/RBfgQ=; b=kmuyu2VS1cWyGx8lBq3NNQAeMWU9GHwgj2uJJ93Kq7bkH+5EQqrJf6aVyBnGNlgRAT z3DT7FTRPoaL1v0t4hfrZJV/sJqTrdlKmeiO5l8atUD0im0Jqt83jKggd7bzoWjWLiTc 4fvhwgK09sIqbsvrhdlfnflHL8/a3iHrKbC8knJNV5aeDXv3wfr7feHCDTCGBTCd53BT XLgIP/YArqu9W/WpHIOaHy+e4QGbEdG9egiv8BadV0khTLXtpWXv+wI2MnOp+J4xWu7u W5h3wPInzW1neE0MlKz8h1JHCt8yCNoR4Nwi4J//CLsccFNMJOGBgY5dLehWGbuq060b scaQ== 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 f13-20020a170906138d00b009b28c286b38si73842ejc.789.2023.10.04.16.00.03; Wed, 04 Oct 2023 16:00:04 -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 E657668CBE4; Thu, 5 Oct 2023 01:59:32 +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 C0D1768CAD4 for ; Thu, 5 Oct 2023 01:59:25 +0300 (EEST) Received: by mail.gandi.net (Postfix) with ESMTPSA id 27CBFE0004 for ; Wed, 4 Oct 2023 22:59:24 +0000 (UTC) From: Michael Niedermayer To: FFmpeg development discussions and patches Date: Thu, 5 Oct 2023 00:59:21 +0200 Message-Id: <20231004225921.30287-4-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 4/4] avcodec/evc_parse: Check tid 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: S0UhyKcxeDdh The check is based on not infinite looping. It is likely a more strict check can be done Fixes: Infinite loop Fixes: 62473/clusterfuzz-testcase-minimized-ffmpeg_BSF_EVC_FRAME_MERGE_fuzzer-5719883750703104 Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg Signed-off-by: Michael Niedermayer --- libavcodec/evc_parse.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/libavcodec/evc_parse.c b/libavcodec/evc_parse.c index 20b6849041a..8c0ef16f3ad 100644 --- a/libavcodec/evc_parse.c +++ b/libavcodec/evc_parse.c @@ -178,6 +178,9 @@ int ff_evc_derive_poc(const EVCParamSets *ps, const EVCParserSliceHeader *sh, } else { int SubGopLength = 1 << sps->log2_sub_gop_length; + if (tid > 1 + av_log2(SubGopLength - 1)) + return AVERROR_INVALIDDATA; + if (tid == 0) { poc->PicOrderCntVal = poc->prevPicOrderCntVal + SubGopLength; poc->DocOffset = 0;